[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] ecea72: FIX CA by prod list filter
From: |
Laurent Destailleur |
Subject: |
[Dolibarr/dolibarr] ecea72: FIX CA by prod list filter |
Date: |
Fri, 14 Feb 2020 10:14:32 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: ecea726323b695197955d1fd01544aa7aa26cfbb
https://github.com/Dolibarr/dolibarr/commit/ecea726323b695197955d1fd01544aa7aa26cfbb
Author: atm-lena <address@hidden>
Date: 2020-02-07 (Fri, 07 Feb 2020)
Changed paths:
M htdocs/compta/stats/cabyprodserv.php
Log Message:
-----------
FIX CA by prod list filter
Commit: 102428a503ea75116b574db286caca08f8fafd7e
https://github.com/Dolibarr/dolibarr/commit/102428a503ea75116b574db286caca08f8fafd7e
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/compta/stats/cabyprodserv.php
Log Message:
-----------
Merge pull request #13056 from atm-lena/FIX_cabyprodlist_filter
FIX CA by prod list filter
Commit: de8660fb5581d557bbb3e920a3fb4b3165fba171
https://github.com/Dolibarr/dolibarr/commit/de8660fb5581d557bbb3e920a3fb4b3165fba171
Author: Marc de Lima Lucio <address@hidden>
Date: 2020-02-12 (Wed, 12 Feb 2020)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
FIX: situation invoice: allow excess paid to be converted to discount
Commit: b1b00450a9f2ff6f3f6890f539281872e117540b
https://github.com/Dolibarr/dolibarr/commit/b1b00450a9f2ff6f3f6890f539281872e117540b
Author: Marc de Lima Lucio <address@hidden>
Date: 2020-02-12 (Wed, 12 Feb 2020)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
FIX: situation invoice: bad amount for previous payments because of local
variable overwriting a more global one
Commit: 700e01d6614af164a8b09c29e654d75398eece28
https://github.com/Dolibarr/dolibarr/commit/700e01d6614af164a8b09c29e654d75398eece28
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-12 (Wed, 12 Feb 2020)
Changed paths:
M htdocs/compta/stats/cabyprodserv.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/stats/cabyprodserv.php
Commit: 5be04859171a9a67fb1b13b6e7cb2e7aa444689a
https://github.com/Dolibarr/dolibarr/commit/5be04859171a9a67fb1b13b6e7cb2e7aa444689a
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-12 (Wed, 12 Feb 2020)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/adherents/subscription/list.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: fa78af19964b0fcf263a30469a970c406f5d4838
https://github.com/Dolibarr/dolibarr/commit/fa78af19964b0fcf263a30469a970c406f5d4838
Author: Marc de Lima Lucio <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr
into 11.0
Commit: 4f1c8e7f53ed7e9aea5baf3a4c11e2f6235084ae
https://github.com/Dolibarr/dolibarr/commit/4f1c8e7f53ed7e9aea5baf3a4c11e2f6235084ae
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/admin/mails.php
Log Message:
-----------
FIX #10203
Commit: 82535291c0b1155da8351502839e99553ae844d9
https://github.com/Dolibarr/dolibarr/commit/82535291c0b1155da8351502839e99553ae844d9
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge pull request #13103 from ATM-Marc/FIX_11.0_situation_excess_recieved
FIX: situation invoices: can't convert excess received to discount & bad
previous payment amount
Commit: ec30938a07d257e17867731d3fe6e3a0dae04eff
https://github.com/Dolibarr/dolibarr/commit/ec30938a07d257e17867731d3fe6e3a0dae04eff
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
Log Message:
-----------
Fix phpcs
Commit: c196342fd8d48ae63eaa50cafbc464a75dbe44b0
https://github.com/Dolibarr/dolibarr/commit/c196342fd8d48ae63eaa50cafbc464a75dbe44b0
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into 11.0
Commit: bb895cb1d82f242011c583946ea4ea560492b85b
https://github.com/Dolibarr/dolibarr/commit/bb895cb1d82f242011c583946ea4ea560492b85b
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/facture/list.php
Log Message:
-----------
FIX ref_client not visible in tooltip.
Commit: e0dd31389ca739489ca0bb6ac95178c0318e7102
https://github.com/Dolibarr/dolibarr/commit/e0dd31389ca739489ca0bb6ac95178c0318e7102
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 11.0.1
Commit: f0596b4bcfab919947f34806809ccc5936652ce3
https://github.com/Dolibarr/dolibarr/commit/f0596b4bcfab919947f34806809ccc5936652ce3
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-13 (Thu, 13 Feb 2020)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 11.0.1
Commit: 72e59e6fe2be1ddce1261eeb278f619fa8d02719
https://github.com/Dolibarr/dolibarr/commit/72e59e6fe2be1ddce1261eeb278f619fa8d02719
Author: Alexandre SPANGARO <address@hidden>
Date: 2020-02-14 (Fri, 14 Feb 2020)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
Log Message:
-----------
FIX: Force FEC export to txt format
Commit: 88f0cc1331b90fa5773686b2e23904e1cb38312a
https://github.com/Dolibarr/dolibarr/commit/88f0cc1331b90fa5773686b2e23904e1cb38312a
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-14 (Fri, 14 Feb 2020)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
Log Message:
-----------
Merge pull request #13113 from aspangaro/9.0_FEC
FIX: Force FEC export to txt format
Commit: 3faed758b32320ff614a1fb22cfb035686500389
https://github.com/Dolibarr/dolibarr/commit/3faed758b32320ff614a1fb22cfb035686500389
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-14 (Fri, 14 Feb 2020)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
FIX #13110
Commit: 3bc122ecf675cea1d607646ab9d32236912df87f
https://github.com/Dolibarr/dolibarr/commit/3bc122ecf675cea1d607646ab9d32236912df87f
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-14 (Fri, 14 Feb 2020)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 58ad62aa7b2843ad0115682630d7a33e4953725e
https://github.com/Dolibarr/dolibarr/commit/58ad62aa7b2843ad0115682630d7a33e4953725e
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-14 (Fri, 14 Feb 2020)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/compta/stats/cabyprodserv.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 11.0
Commit: 35ada37d4d9e7da084ef9e15f7f8da17e9c879ce
https://github.com/Dolibarr/dolibarr/commit/35ada37d4d9e7da084ef9e15f7f8da17e9c879ce
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-14 (Fri, 14 Feb 2020)
Changed paths:
M ChangeLog
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/admin/mails.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/list.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/fourn/facture/list.php
Log Message:
-----------
Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/c033b00ef3d8...35ada37d4d9e