[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c844e3: Fix: Option CASHDESK_SHOW_KEY
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c844e3: Fix: Option CASHDESK_SHOW_KEYPAD was not working |
Date: |
Thu, 04 Dec 2014 05:52:48 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c844e35fa1536b1bed55d3d56848b842d9a9580c
https://github.com/Dolibarr/dolibarr/commit/c844e35fa1536b1bed55d3d56848b842d9a9580c
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/cashdesk/include/keypad.php
Log Message:
-----------
Fix: Option CASHDESK_SHOW_KEYPAD was not working
Commit: 3de0702f2bfd531481970543687e23c42773c95c
https://github.com/Dolibarr/dolibarr/commit/3de0702f2bfd531481970543687e23c42773c95c
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/accountancy/customer/index.php
Log Message:
-----------
Fixed: All sql requests are now logged
Commit: b5d74372de4b10223b85d23837147b6357207efa
https://github.com/Dolibarr/dolibarr/commit/b5d74372de4b10223b85d23837147b6357207efa
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/admin/mailman.php
M htdocs/admin/spip.php
M htdocs/barcode/printsheet.php
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Bad var
Commit: 0bc9ae25f0a9f7845d76ffc4d3aa0b93d4bbe124
https://github.com/Dolibarr/dolibarr/commit/0bc9ae25f0a9f7845d76ffc4d3aa0b93d4bbe124
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
Fix: Var not defined
Commit: fe33a2a42e4c2ba9735204b2cb2bcc488a34ed5f
https://github.com/Dolibarr/dolibarr/commit/fe33a2a42e4c2ba9735204b2cb2bcc488a34ed5f
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Better translation
Commit: 76bd7dd5128ce64d29b01ee2eee657b7ff9b14b4
https://github.com/Dolibarr/dolibarr/commit/76bd7dd5128ce64d29b01ee2eee657b7ff9b14b4
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/langs/en_US/projects.lang
M htdocs/projet/index.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/index.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fixed: A lot of fixed on project views (info on project area). Also add
a limit to avoid problem with very large database.
Commit: 937414e9b181e8ea7b446f81e1b6a186e4d802e1
https://github.com/Dolibarr/dolibarr/commit/937414e9b181e8ea7b446f81e1b6a186e4d802e1
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M .tx/config
M htdocs/accountancy/customer/index.php
M htdocs/admin/boxes.php
M htdocs/admin/const.php
M htdocs/admin/mailman.php
M htdocs/admin/spip.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/card.php
M htdocs/cashdesk/include/keypad.php
M htdocs/core/class/commonobject.class.php
R htdocs/langs/ar_SA/oscommerce.lang
R htdocs/langs/bg_BG/oscommerce.lang
R htdocs/langs/bs_BA/oscommerce.lang
R htdocs/langs/ca_ES/oscommerce.lang
R htdocs/langs/cs_CZ/oscommerce.lang
R htdocs/langs/da_DK/oscommerce.lang
R htdocs/langs/de_AT/oscommerce.lang
R htdocs/langs/de_DE/oscommerce.lang
R htdocs/langs/el_GR/oscommerce.lang
R htdocs/langs/en_US/oscommerce.lang
M htdocs/langs/en_US/resource.lang
R htdocs/langs/es_ES/oscommerce.lang
R htdocs/langs/et_EE/oscommerce.lang
R htdocs/langs/eu_ES/oscommerce.lang
R htdocs/langs/fa_IR/oscommerce.lang
R htdocs/langs/fi_FI/oscommerce.lang
R htdocs/langs/fr_FR/oscommerce.lang
M htdocs/langs/fr_FR/resource.lang
R htdocs/langs/he_IL/oscommerce.lang
R htdocs/langs/hr_HR/oscommerce.lang
R htdocs/langs/hu_HU/oscommerce.lang
R htdocs/langs/id_ID/oscommerce.lang
R htdocs/langs/is_IS/oscommerce.lang
R htdocs/langs/it_IT/oscommerce.lang
R htdocs/langs/ja_JP/oscommerce.lang
R htdocs/langs/ko_KR/oscommerce.lang
R htdocs/langs/lt_LT/oscommerce.lang
R htdocs/langs/lv_LV/oscommerce.lang
R htdocs/langs/mk_MK/oscommerce.lang
R htdocs/langs/nb_NO/oscommerce.lang
R htdocs/langs/nl_BE/oscommerce.lang
R htdocs/langs/nl_NL/oscommerce.lang
R htdocs/langs/pl_PL/oscommerce.lang
R htdocs/langs/pt_BR/oscommerce.lang
R htdocs/langs/pt_PT/oscommerce.lang
R htdocs/langs/ro_RO/oscommerce.lang
R htdocs/langs/ru_RU/oscommerce.lang
R htdocs/langs/sk_SK/oscommerce.lang
R htdocs/langs/sl_SI/oscommerce.lang
R htdocs/langs/sq_AL/oscommerce.lang
R htdocs/langs/sv_SE/oscommerce.lang
R htdocs/langs/th_TH/oscommerce.lang
R htdocs/langs/tr_TR/oscommerce.lang
R htdocs/langs/uk_UA/oscommerce.lang
R htdocs/langs/uz_UZ/oscommerce.lang
R htdocs/langs/vi_VN/oscommerce.lang
R htdocs/langs/zh_CN/oscommerce.lang
R htdocs/langs/zh_TW/oscommerce.lang
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 782486bb4cedbedef4cfc694727473cce34b675e
https://github.com/Dolibarr/dolibarr/commit/782486bb4cedbedef4cfc694727473cce34b675e
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/projet/index.php
Log Message:
-----------
Fix: Project with no tasks was not visible
Commit: ec9c3cc1156ad35b20184e76549b9bc793cb333e
https://github.com/Dolibarr/dolibarr/commit/ec9c3cc1156ad35b20184e76549b9bc793cb333e
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/projet/element.php
M htdocs/projet/tasks/task.php
Log Message:
-----------
Fix: Better translation
Commit: 83122ebe1e80d9fa3abd05a4d4b5c658c7d791e0
https://github.com/Dolibarr/dolibarr/commit/83122ebe1e80d9fa3abd05a4d4b5c658c7d791e0
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/admin/commande.php
M htdocs/admin/facture.php
M htdocs/admin/order_extrafields.php
M htdocs/admin/orderdet_extrafields.php
M htdocs/admin/propal.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
A htdocs/core/actions_printipp.inc.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/lib/ldap.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/modules/modPrintIPP.class.php
M htdocs/langs/en_US/printipp.lang
M htdocs/printipp/admin/printipp.php
M htdocs/printipp/lib/printipp.lib.php
M htdocs/societe/admin/contact_extrafields.php
Log Message:
-----------
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
for release.
Commit: 9c2485c469458031919f7e72142cdb647cf82265
https://github.com/Dolibarr/dolibarr/commit/9c2485c469458031919f7e72142cdb647cf82265
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Better explanation
Commit: f6be48f25587ec3af421e0a56b722dcfa4a5d4a3
https://github.com/Dolibarr/dolibarr/commit/f6be48f25587ec3af421e0a56b722dcfa4a5d4a3
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Better translation
Commit: 6729544782c79c30d767f227caa66f7f01f0053b
https://github.com/Dolibarr/dolibarr/commit/6729544782c79c30d767f227caa66f7f01f0053b
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/accountancy/customer/index.php
M htdocs/admin/commande.php
M htdocs/admin/facture.php
M htdocs/admin/mailman.php
M htdocs/admin/order_extrafields.php
M htdocs/admin/orderdet_extrafields.php
M htdocs/admin/propal.php
M htdocs/admin/spip.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/card.php
M htdocs/cashdesk/include/keypad.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
A htdocs/core/actions_printipp.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/lib/ldap.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/modules/modPrintIPP.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/printipp.lang
M htdocs/langs/en_US/projects.lang
M htdocs/printipp/admin/printipp.php
M htdocs/printipp/lib/printipp.lib.php
M htdocs/product/class/product.class.php
M htdocs/projet/element.php
M htdocs/projet/index.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/index.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/societe/admin/contact_extrafields.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/projet/tasks/task.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/860d0b08202e...6729544782c7