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
Frédéric FRANCE
1abef27a1a
fix delivery_date
2020-11-16 13:52:35 +01:00
Laurent Destailleur
ca02ac9e45
Remove warning for php8
2020-11-16 13:00:18 +01:00
Laurent Destailleur
96b15420f0
Fix regression
2020-11-16 12:56:13 +01:00
Laurent Destailleur
ac5fa6c6df
Clean code
2020-11-16 12:54:16 +01:00
Laurent Destailleur
928330c44b
Fix link to reconciliation page
2020-11-16 12:42:59 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Laurent Destailleur
65144f4d5a
fix warning
2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759
Fix for #15423
2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php
2020-11-15 23:58:35 +01:00
Laurent Destailleur
0c2c6ab6d1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2020-11-15 23:51:01 +01:00
Laurent Destailleur
217aa9c420
Clean CI
2020-11-15 23:50:11 +01:00
Laurent Destailleur
8ac3d5f9bf
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-15 23:49:22 +01:00
Frédéric FRANCE
d114c56672
add a tag which list all other tags in odt user
2020-11-15 23:49:16 +01:00
Laurent Destailleur
7fdc63faa6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-11-15 23:48:52 +01:00
Laurent Destailleur
556888d55c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-11-15 23:48:18 +01:00
Laurent Destailleur
5e1cd459b1
Fix travis
2020-11-15 23:47:53 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag
2020-11-15 23:45:13 +01:00
Laurent Destailleur
e2ea25fd78
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-15 17:29:31 +01:00
Laurent Destailleur
cbe9fec51d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/ticket/list.php
2020-11-15 17:29:19 +01:00
Laurent Destailleur
b9192744cc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-15 17:16:05 +01:00
Laurent Destailleur
30681f9179
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-15 17:15:56 +01:00
Laurent Destailleur
2480079153
Merge pull request #15420 from frederic34/patch-27
...
fix warnings
2020-11-15 17:14:07 +01:00
Laurent Destailleur
6d57d8a3dd
Merge pull request #15419 from frederic34/patch-8
...
add translation for admin odt for members
2020-11-15 17:13:35 +01:00
Laurent Destailleur
f101b3e43d
Merge pull request #15402 from BlueGarm/BlueGarm-Order-Partially-and-Delay
...
Add orders received partially and delay icons
2020-11-15 17:13:07 +01:00
