[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 31e9fd: Merge
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 31e9fd: Merge |
|
Date: |
Mon, 18 Feb 2019 10:15:27 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 31e9fd46a44df16acc48a0b8180fa2e86f16cdb4
https://github.com/Dolibarr/dolibarr/commit/31e9fd46a44df16acc48a0b8180fa2e86f16cdb4
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-14 (Thu, 14 Feb 2019)
Changed paths:
M htdocs/adherents/subscription/list.php
Log Message:
-----------
Merge
Commit: 8cc2662f01d362836b588887cd1e566b7d68fb7d
https://github.com/Dolibarr/dolibarr/commit/8cc2662f01d362836b588887cd1e566b7d68fb7d
Author: andreubisquerra <address@hidden>
Date: 2019-02-14 (Thu, 14 Feb 2019)
Changed paths:
M htdocs/langs/en_US/cashdesk.lang
M htdocs/takepos/admin/orderprinters.php
M htdocs/takepos/admin/setup.php
M htdocs/takepos/css/pos.css
M htdocs/takepos/invoice.php
M htdocs/takepos/pay.php
M htdocs/takepos/receipt.php
M htdocs/takepos/takepos.php
Log Message:
-----------
Update TakePOS in Dolibarr 9
Commit: df5dbd411035cc1bf5e1069249e3d9b3b46654ed
https://github.com/Dolibarr/dolibarr/commit/df5dbd411035cc1bf5e1069249e3d9b3b46654ed
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-14 (Thu, 14 Feb 2019)
Changed paths:
M htdocs/public/payment/newpayment.php
Log Message:
-----------
Fix bad ip
Commit: 7e171c8750c404f9d006fef9d1abf8c57707dfcd
https://github.com/Dolibarr/dolibarr/commit/7e171c8750c404f9d006fef9d1abf8c57707dfcd
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-15 (Fri, 15 Feb 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX adding css by page if url is externam
Conflicts:
htdocs/main.inc.php
Commit: 67f8942895620e19bc8db8e3d00e32d80f6336a9
https://github.com/Dolibarr/dolibarr/commit/67f8942895620e19bc8db8e3d00e32d80f6336a9
Author: Frédéric FRANCE <address@hidden>
Date: 2019-02-15 (Fri, 15 Feb 2019)
Changed paths:
M htdocs/stripe/admin/stripe.php
Log Message:
-----------
Form::select_comptes return void
Commit: b1d19fe79a5c97062ab44ade7f62a6fa345745bd
https://github.com/Dolibarr/dolibarr/commit/b1d19fe79a5c97062ab44ade7f62a6fa345745bd
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-15 (Fri, 15 Feb 2019)
Changed paths:
R htdocs/modulebuilder/template/phpdoc.dist.xml
Log Message:
-----------
Removed not used file
Commit: d57eac094d2c0d9acffa2aa50e152d6099517f44
https://github.com/Dolibarr/dolibarr/commit/d57eac094d2c0d9acffa2aa50e152d6099517f44
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-15 (Fri, 15 Feb 2019)
Changed paths:
M .travis.yml
Log Message:
-----------
Add php 7.3 into travis
Commit: b018c5d26395c3e8a2c6e2abe0da4a07003ed7eb
https://github.com/Dolibarr/dolibarr/commit/b018c5d26395c3e8a2c6e2abe0da4a07003ed7eb
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-15 (Fri, 15 Feb 2019)
Changed paths:
M htdocs/langs/en_US/cashdesk.lang
M htdocs/takepos/admin/orderprinters.php
M htdocs/takepos/admin/setup.php
M htdocs/takepos/css/pos.css
M htdocs/takepos/invoice.php
M htdocs/takepos/pay.php
M htdocs/takepos/receipt.php
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge pull request #10614 from andreubisquerra/9.0
Update TakePOS in Dolibarr 9
Commit: d2fc756014d9dae4305d1307e4601af73495e889
https://github.com/Dolibarr/dolibarr/commit/d2fc756014d9dae4305d1307e4601af73495e889
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-15 (Fri, 15 Feb 2019)
Changed paths:
M htdocs/stripe/admin/stripe.php
Log Message:
-----------
Merge pull request #10618 from frederic34/patch-28
Form::select_comptes return void
Commit: b2ec340a4818646fc3cfeb05948d6e8b7a747a33
https://github.com/Dolibarr/dolibarr/commit/b2ec340a4818646fc3cfeb05948d6e8b7a747a33
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/takepos/class/actions_takepos.class.php
Log Message:
-----------
FIX Show button POS Ticket only if invoice was generated by POS
Commit: b2e0b1216ed8ff44ce3f4d13ecd33759ff8fde01
https://github.com/Dolibarr/dolibarr/commit/b2e0b1216ed8ff44ce3f4d13ecd33759ff8fde01
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/langs/en_US/cashdesk.lang
M htdocs/stripe/admin/stripe.php
M htdocs/takepos/admin/orderprinters.php
M htdocs/takepos/admin/setup.php
M htdocs/takepos/css/pos.css
M htdocs/takepos/invoice.php
M htdocs/takepos/pay.php
M htdocs/takepos/receipt.php
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 75b875ae556c7ca93dfcd8fe7aacab0e80eda57d
https://github.com/Dolibarr/dolibarr/commit/75b875ae556c7ca93dfcd8fe7aacab0e80eda57d
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/comm/remx.php
Log Message:
-----------
Fix origin currency not visible in absolute discount view
Commit: 07d1559802073d301290e219f284fbb645034730
https://github.com/Dolibarr/dolibarr/commit/07d1559802073d301290e219f284fbb645034730
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/class/discount.class.php
Log Message:
-----------
FIX Mark credit note as available for credit note in other currency
Commit: e4698fb6a5a122e6b6233587627c0e400adc1e85
https://github.com/Dolibarr/dolibarr/commit/e4698fb6a5a122e6b6233587627c0e400adc1e85
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/adherents/subscription/list.php
M htdocs/comm/remx.php
M htdocs/compta/facture/card.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/class/discount.class.php
R htdocs/modulebuilder/template/phpdoc.dist.xml
M htdocs/public/payment/newpayment.php
M htdocs/stripe/admin/stripe.php
R htdocs/takepos/class/actions_takepos.class.php
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge
Commit: ebfb6beee37a7d1fe4c65f5ac02f6ec04d882f0f
https://github.com/Dolibarr/dolibarr/commit/ebfb6beee37a7d1fe4c65f5ac02f6ec04d882f0f
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/core/modules/modTakePos.class.php
M htdocs/install/upgrade2.php
Log Message:
-----------
Merge
Compare:
https://github.com/Dolibarr/dolibarr/compare/09fa5b045652...ebfb6beee37a