[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a524bb: FIX : when we create deposit
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a524bb: FIX : when we create deposit with multi tva, we mu... |
Date: |
Fri, 15 Mar 2019 11:20:27 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: a524bbc5c692523fe6fcfdb1ab609b21adbf5ef2
https://github.com/Dolibarr/dolibarr/commit/a524bbc5c692523fe6fcfdb1ab609b21adbf5ef2
Author: gauthier <address@hidden>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
FIX : when we create deposit with multi tva, we mustn't add line if amount =
0 (example when we have a 100% reduc on one of origin invoice line)
Commit: 2da60fb885cbdfbd0f0ec3fdf4d8277b4b41225b
https://github.com/Dolibarr/dolibarr/commit/2da60fb885cbdfbd0f0ec3fdf4d8277b4b41225b
Author: atm-ph <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/projet/activity/perday.php
Log Message:
-----------
Fix var name
Commit: 6f0fbc42c18d10dde65c4266b945d5634b64f76e
https://github.com/Dolibarr/dolibarr/commit/6f0fbc42c18d10dde65c4266b945d5634b64f76e
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/don/card.php
M htdocs/expensereport/card.php
M htdocs/projet/card.php
M htdocs/public/members/new.php
M htdocs/public/opensurvey/studs.php
Log Message:
-----------
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
Commit: 482a37a2c9e94ee8720abd7391806a72e0fb0054
https://github.com/Dolibarr/dolibarr/commit/482a37a2c9e94ee8720abd7391806a72e0fb0054
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/projet/activity/perday.php
Log Message:
-----------
Merge pull request #10850 from atm-ph/fix_7.0_var_name
Fix var name
Commit: abf529770de20d9ac09dbca64ef8717e23a4c5b0
https://github.com/Dolibarr/dolibarr/commit/abf529770de20d9ac09dbca64ef8717e23a4c5b0
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 2e94f8043fc8a15b264ee947e18b432927fa680a
https://github.com/Dolibarr/dolibarr/commit/2e94f8043fc8a15b264ee947e18b432927fa680a
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: b33c366b0227f9f185a9664b4eea55fb3045c802
https://github.com/Dolibarr/dolibarr/commit/b33c366b0227f9f185a9664b4eea55fb3045c802
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Update card.php
Commit: 4bb45ad1c1a7ec7aedb062c2e50e492ba7710627
https://github.com/Dolibarr/dolibarr/commit/4bb45ad1c1a7ec7aedb062c2e50e492ba7710627
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge pull request #10824 from
atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero
FIX : when we create deposit with multi tva, we mustn't add line if a…
Commit: 681d626284193409d06a70586a2751f9a8f7ea8b
https://github.com/Dolibarr/dolibarr/commit/681d626284193409d06a70586a2751f9a8f7ea8b
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 39e24d30aa854f82f46ca2cb858d09e21963cbfc
https://github.com/Dolibarr/dolibarr/commit/39e24d30aa854f82f46ca2cb858d09e21963cbfc
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 875b5b6a8dde8c2e21517dcdabe0b94db1184396
https://github.com/Dolibarr/dolibarr/commit/875b5b6a8dde8c2e21517dcdabe0b94db1184396
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-15 (Fri, 15 Mar 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/opensurvey/studs.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/a1adcc785ce5...875b5b6a8dde