[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6c7a5c: FIX check verif exped on dele
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6c7a5c: FIX check verif exped on delete order |
|
Date: |
Tue, 13 Mar 2018 10:08:04 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6c7a5cebdfc37ce02c3acf0088a62793fd16c087
https://github.com/Dolibarr/dolibarr/commit/6c7a5cebdfc37ce02c3acf0088a62793fd16c087
Author: atm-quentin <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX check verif exped on delete order
Commit: 51229a602f136f5aa9c654af6edcf43edf8588e9
https://github.com/Dolibarr/dolibarr/commit/51229a602f136f5aa9c654af6edcf43edf8588e9
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Update commande.class.php
Commit: dcd3387a30cd57c59ab2f94d38dd2574452c647d
https://github.com/Dolibarr/dolibarr/commit/dcd3387a30cd57c59ab2f94d38dd2574452c647d
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Update commande.class.php
Commit: f82bedb36c8c4bc63d815c0fb03a62c3cb49512a
https://github.com/Dolibarr/dolibarr/commit/f82bedb36c8c4bc63d815c0fb03a62c3cb49512a
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #8367 from atm-quentin/6.0
FIX check shipping on delete order
Commit: 4f6f0b302ef10d90ab9bdac16e6f57d73d7168d1
https://github.com/Dolibarr/dolibarr/commit/4f6f0b302ef10d90ab9bdac16e6f57d73d7168d1
Author: ptibogxiv <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
FIX for nondisplay of fk_element 's id in REST API response
the fk_element don't display when the call is made with REST API (reason non
found)
Commit: 1c731f1d0c30e437e9d1fa321a21984b3227d7b1
https://github.com/Dolibarr/dolibarr/commit/1c731f1d0c30e437e9d1fa321a21984b3227d7b1
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge pull request #8368 from ptibogxiv/patch-13
FIX for nondisplay of fk_element 's id in REST API response
Commit: 17b7c6268e81a0a13e1bc74e99e6efa9b489b3a6
https://github.com/Dolibarr/dolibarr/commit/17b7c6268e81a0a13e1bc74e99e6efa9b489b3a6
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
FIX avoid "Array" on screen
Commit: f88536068f09d44546507b40a062f5ecb1b6d4cd
https://github.com/Dolibarr/dolibarr/commit/f88536068f09d44546507b40a062f5ecb1b6d4cd
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: af09a3714b3ea937730cb171b008635429d94bc8
https://github.com/Dolibarr/dolibarr/commit/af09a3714b3ea937730cb171b008635429d94bc8
Author: atm-quentin <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
FIX reverse field to have object loaded in doaction
Commit: 3f490906f9c372eaed7c8f08e84d909c82b55d08
https://github.com/Dolibarr/dolibarr/commit/3f490906f9c372eaed7c8f08e84d909c82b55d08
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/langs/en_US/stripe.lang
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Trans
Commit: 6b2490f4e475cf52da4688d0fe8a6d9ce0fc8a23
https://github.com/Dolibarr/dolibarr/commit/6b2490f4e475cf52da4688d0fe8a6d9ce0fc8a23
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Merge pull request #8375 from atm-quentin/6.0
FIX reverse field to have object loaded in doaction
Commit: ca809a11af0edd02730fefdbb13ab9cba00dcfdc
https://github.com/Dolibarr/dolibarr/commit/ca809a11af0edd02730fefdbb13ab9cba00dcfdc
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/commande/class/commande.class.php
Commit: 0258d3aeeb055b6b976cb8ab3df86148dcfcb3ed
https://github.com/Dolibarr/dolibarr/commit/0258d3aeeb055b6b976cb8ab3df86148dcfcb3ed
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/class/commande.class.php
M htdocs/projet/element.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: a1b03081f639943bfbe8ab507eb8b75501782c64
https://github.com/Dolibarr/dolibarr/commit/a1b03081f639943bfbe8ab507eb8b75501782c64
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 60283a8205ef7a75b90e53bd1e25b198cb22f0ec
https://github.com/Dolibarr/dolibarr/commit/60283a8205ef7a75b90e53bd1e25b198cb22f0ec
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-13 (Tue, 13 Mar 2018)
Changed paths:
R htdocs/langs/ar_SA/incoterm.lang
R htdocs/langs/bg_BG/incoterm.lang
R htdocs/langs/bn_BD/incoterm.lang
R htdocs/langs/bs_BA/incoterm.lang
R htdocs/langs/ca_ES/incoterm.lang
R htdocs/langs/cs_CZ/incoterm.lang
R htdocs/langs/da_DK/incoterm.lang
R htdocs/langs/de_DE/incoterm.lang
R htdocs/langs/el_GR/incoterm.lang
M htdocs/langs/en_US/admin.lang
R htdocs/langs/en_US/incoterm.lang
M htdocs/langs/en_US/main.lang
R htdocs/langs/es_ES/incoterm.lang
R htdocs/langs/et_EE/incoterm.lang
R htdocs/langs/eu_ES/incoterm.lang
R htdocs/langs/fa_IR/incoterm.lang
R htdocs/langs/fi_FI/incoterm.lang
R htdocs/langs/fr_CA/incoterm.lang
R htdocs/langs/fr_FR/incoterm.lang
R htdocs/langs/he_IL/incoterm.lang
R htdocs/langs/hr_HR/incoterm.lang
R htdocs/langs/hu_HU/incoterm.lang
R htdocs/langs/id_ID/incoterm.lang
R htdocs/langs/is_IS/incoterm.lang
R htdocs/langs/it_IT/incoterm.lang
R htdocs/langs/ja_JP/incoterm.lang
R htdocs/langs/ka_GE/incoterm.lang
R htdocs/langs/kn_IN/incoterm.lang
R htdocs/langs/ko_KR/incoterm.lang
R htdocs/langs/lo_LA/incoterm.lang
R htdocs/langs/lt_LT/incoterm.lang
R htdocs/langs/lv_LV/incoterm.lang
R htdocs/langs/mk_MK/incoterm.lang
R htdocs/langs/mn_MN/incoterm.lang
R htdocs/langs/nb_NO/incoterm.lang
R htdocs/langs/nl_NL/incoterm.lang
R htdocs/langs/pl_PL/incoterm.lang
R htdocs/langs/pt_BR/incoterm.lang
R htdocs/langs/pt_PT/incoterm.lang
R htdocs/langs/ro_RO/incoterm.lang
R htdocs/langs/ru_RU/incoterm.lang
R htdocs/langs/sk_SK/incoterm.lang
R htdocs/langs/sl_SI/incoterm.lang
R htdocs/langs/sq_AL/incoterm.lang
R htdocs/langs/sr_RS/incoterm.lang
R htdocs/langs/sv_SE/incoterm.lang
R htdocs/langs/sw_SW/incoterm.lang
R htdocs/langs/th_TH/incoterm.lang
R htdocs/langs/tr_TR/incoterm.lang
R htdocs/langs/uk_UA/incoterm.lang
R htdocs/langs/uz_UZ/incoterm.lang
R htdocs/langs/vi_VN/incoterm.lang
R htdocs/langs/zh_CN/incoterm.lang
R htdocs/langs/zh_TW/incoterm.lang
Log Message:
-----------
Remove file incoterm.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/c923231d5427...60283a8205ef