Commit Graph

91791 Commits

Author SHA1 Message Date
Laurent Destailleur
ad159013e4
Merge pull request #15433 from OPEN-DSI/new-takepos-invoice-valid-sale-without-lines
NEW log sale without lines as error in cash desk
2020-11-18 18:09:10 +01:00
Laurent Destailleur
745cae3f8b
Merge pull request #15429 from fappels/13_doc
Fix supplier barcode should be same in fetch and fetch list.
2020-11-18 18:08:35 +01:00
Laurent Destailleur
1dd697767e
Merge branch 'develop' into 13_doc 2020-11-18 18:08:14 +01:00
Laurent Destailleur
83eaf16a22 Fix css 2020-11-18 16:23:08 +01:00
Laurent Destailleur
348185ff15 Fix js error 2020-11-18 16:04:05 +01:00
Laurent Destailleur
32ae1bf350 Sync transifex 2020-11-18 15:56:06 +01:00
Francis Appels
aade8e7adb Add deprecated fourn_barcode incase already used external. 2020-11-18 14:58:04 +01:00
lvessiller
8de5925f8b FIX remove LOG_ERR in syslog 2020-11-18 14:32:11 +01:00
Francis Appels
22985e7b61 Revert "use barcode iso supplier_barcode"
This reverts commit 57705e225b.
2020-11-18 14:27:29 +01:00
Laurent Destailleur
081474b65d Trans 2020-11-18 14:24:24 +01:00
Laurent Destailleur
cfee518338 Fix trans 2020-11-18 14:03:44 +01:00
Laurent Destailleur
2cbb1c09d5 Add missing token 2020-11-18 13:18:47 +01:00
Laurent Destailleur
c5929a62b7 Fix token 2020-11-18 13:17:53 +01:00
Laurent Destailleur
e78b9a421d Fix sql 2020-11-18 13:14:29 +01:00
Laurent Destailleur
0dbacab68f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-18 13:12:12 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
8d8f0026c2 Fix switch date to datetime 2020-11-18 13:06:30 +01:00
Laurent Destailleur
6150d3bb2c
Merge pull request #15430 from fappels/13_fix_supplier_barcode
Improve doc for customer order delivery date
2020-11-18 12:54:34 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423
Fix for #15423
2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php 2020-11-18 12:45:37 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10
add optional tag which list all other tags in odt substitutions
2020-11-18 12:44:25 +01:00
Laurent Destailleur
4ca6959c93
Merge pull request #15426 from frederic34/patch-14
fix delivery_date
2020-11-18 12:42:44 +01:00
Laurent Destailleur
1a21ace02d
Update fournisseur.commande.class.php 2020-11-18 12:42:33 +01:00
Laurent Destailleur
780b8a6fb2 Fix navigation between members 2020-11-18 12:40:21 +01:00
Laurent Destailleur
68df96218f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-18 12:37:33 +01:00
Laurent Destailleur
2529448f1b Fix path to files 2020-11-18 12:37:18 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8
fix dir for member photo in odt tag
2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php 2020-11-18 12:04:41 +01:00
Laurent Destailleur
949b50f8f2
Merge pull request #15435 from dolibit-ut/patch-38
Update ChangeLog
2020-11-18 11:51:07 +01:00
kamel
709822635c Correction Stickler CI 2020-11-18 09:46:23 +01:00
kamel
73b35f334e NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec FIX Protection to avoid duplicate submit when creating a payment. 2020-11-17 18:39:34 +01:00
UT from dolibit
44cd54ba30
Update ChangeLog
edit Changelog 13.0.0 -  try to uniform:  API, PDF, ODT, ECM ..  always capital letters; TakePOS uniform ..
2020-11-17 18:15:49 +01:00
Laurent Destailleur
6e8b474b6f Debug v13 2020-11-17 14:18:07 +01:00
Laurent Destailleur
3e4c6b9222 Fix warning 2020-11-17 13:13:11 +01:00
Frédéric FRANCE
3b1f50d5fc
Update functions.lib.php 2020-11-17 11:58:11 +01:00
Frédéric FRANCE
bf390ceb4d
Update doc_generic_member_odt.class.php 2020-11-17 11:56:11 +01:00
Frédéric FRANCE
fcfd630f84
Update doc_generic_user_odt.modules.php 2020-11-17 11:55:05 +01:00
Frédéric FRANCE
fb5385180f
Update functions.lib.php 2020-11-17 11:54:18 +01:00
lvessiller
3048a16b42 NEW log sale without lines as error in cash desk 2020-11-17 10:11:58 +01:00
Laurent Destailleur
abc420ff57 Clean code. This seems no more required. 2020-11-16 19:23:13 +01:00
Francis Appels
3e491b6879 Revert "Fix supplier barcode should be same in fetch and fetch list."
This reverts commit 5af557c902.
2020-11-16 18:07:39 +01:00
Francis Appels
57705e225b use barcode iso supplier_barcode 2020-11-16 18:02:54 +01:00
Francis Appels
9936d8c559 Revert "doc for delivery_date"
This reverts commit aed6afc3bf.
2020-11-16 17:54:52 +01:00
Francis Appels
aed6afc3bf doc for delivery_date 2020-11-16 17:37:38 +01:00
Francis Appels
5af557c902 Fix supplier barcode should be same in fetch and fetch list.
Refactor fourn to supplier for barcode
2020-11-16 17:36:53 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
548a25b005 Fix use of token 2020-11-16 14:36:23 +01:00
Laurent Destailleur
d8753ea224 Fix trans 2020-11-16 14:15:54 +01:00
Frédéric FRANCE
4ef4792469
Update fournisseur.commande.class.php 2020-11-16 13:57:59 +01:00