[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 647390: FIX: expedition: reset status
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 647390: FIX: expedition: reset status on rollback + replac... |
Date: |
Fri, 08 Feb 2019 01:29:24 -0800 |
Branch: refs/heads/8.0
Home: https://github.com/Dolibarr/dolibarr
Commit: 64739098ae31d8277a145784fa45863f7f65baf7
https://github.com/Dolibarr/dolibarr/commit/64739098ae31d8277a145784fa45863f7f65baf7
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-02-05 (Tue, 05 Feb 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: expedition: reset status on rollback + replace hardcoded status with
const
Commit: 428efa922797502740342eac001a70e53a20c5db
https://github.com/Dolibarr/dolibarr/commit/428efa922797502740342eac001a70e53a20c5db
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-02-05 (Tue, 05 Feb 2019)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
FIX: line edit template: keep fk_parent_line
Commit: 76b021d0611e187dfa84569fe3c9f17c2cfb3520
https://github.com/Dolibarr/dolibarr/commit/76b021d0611e187dfa84569fe3c9f17c2cfb3520
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-08 (Fri, 08 Feb 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #10505 from ATM-Marc/FIX_7.0_expedition_status
FIX: expedition: reset status on rollback
Commit: 4997b5968f87fed820d06ba0cbf4174f539b6098
https://github.com/Dolibarr/dolibarr/commit/4997b5968f87fed820d06ba0cbf4174f539b6098
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-08 (Fri, 08 Feb 2019)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line
FIX: line edit template: keep fk_parent_line
Commit: 679a13e48c8da870f16f064efb96b1d898d8e51d
https://github.com/Dolibarr/dolibarr/commit/679a13e48c8da870f16f064efb96b1d898d8e51d
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-08 (Fri, 08 Feb 2019)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/expedition/class/expedition.class.php
Commit: 1c129a78ae046153c4c2a34330cdea269420cb94
https://github.com/Dolibarr/dolibarr/commit/1c129a78ae046153c4c2a34330cdea269420cb94
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-08 (Fri, 08 Feb 2019)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/fourn/facture/paiement.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 43fbcf7081cd5a2dcb51153ce47c0e926053f31e
https://github.com/Dolibarr/dolibarr/commit/43fbcf7081cd5a2dcb51153ce47c0e926053f31e
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-08 (Fri, 08 Feb 2019)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 8.0.5
Compare:
https://github.com/Dolibarr/dolibarr/compare/3318baa66426...43fbcf7081cd