Commit Graph

9249 Commits

Author SHA1 Message Date
Laurent Destailleur
025cbe8557 Add missing tag order_ref and order_ref_customer on shipments for ODT
generation.
2020-12-06 19:01:09 +01:00
Laurent Destailleur
de61a7cfd3 Fix cleaning html tags with trans and with GETPOST. 2020-12-06 17:30:27 +01:00
Laurent Destailleur
1f83e22aea Fix set of translation of website page during cloning 2020-12-06 15:59:19 +01:00
Frédéric FRANCE
fbc0be3a43 doxygen 2020-12-05 23:57:31 +01:00
Frédéric FRANCE
4e18f46f28 doxygen 2020-12-05 23:53:55 +01:00
Laurent Destailleur
15455690b9 Fix setup 2020-12-05 14:06:50 +01:00
Laurent Destailleur
af1bb09338 NEW: Graphics can be horizontal bars. 2020-12-04 22:30:34 +01:00
Laurent Destailleur
d8b01d9a33 Fix chart is default graph lib 2020-12-04 22:12:20 +01:00
Frédéric FRANCE
a2eab824c1 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Laurent Destailleur
f0dec80dae css 2020-12-04 15:39:30 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +01:00
Laurent Destailleur
040d22ef0a Fix phpcs 2020-12-04 01:59:47 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
Laurent Destailleur
49be354c3e Fix warning 2020-12-02 14:05:17 +01:00
Laurent Destailleur
c5ff32c2d2 Fix accept <u> and <i> into translation strings 2020-12-01 17:01:35 +01:00
Laurent Destailleur
c0c03f5270 Fix allow tag <center> into translation strings 2020-12-01 15:59:54 +01:00
Laurent Destailleur
3b3f9acdbb Remove warning 2020-12-01 11:36:58 +01:00
stickler-ci
7d966d7a49 Fixing style errors. 2020-12-01 01:42:18 +00:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
2707c0b89b Look and feel v13 2020-11-30 20:13:42 +01:00
Laurent Destailleur
de718837e4 Fix warnings 2020-11-30 19:43:43 +01:00
Laurent Destailleur
c0baf483dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-30 18:28:24 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
Laurent Destailleur
6f0d49d68d Merge pull request #15578 from Tim-Otte/fix-product-supplier-price-extrafield
FIX for product supplier price extrafields
2020-11-30 15:44:04 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
bd5dc6399b Fix deprecated code 2020-11-30 12:35:05 +01:00
Laurent Destailleur
4f2259ea38 Fix warning 2020-11-30 12:03:04 +01:00
Tim Otte
16b69a069e Fixed sql error where column names were used instead of sql column names 2020-11-30 10:21:10 +01:00
Laurent Destailleur
150dd71774 Look and feel v13 2020-11-29 16:02:39 +01:00
Laurent Destailleur
404634919d Look and feel v13 2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01:00
andreubisquerra
c9c2869eec Fix travis 2020-11-27 19:45:40 +01:00
andreubisquerra
c3bc662675 Improve free entries printing in TakePOS
Improve free entries printing with Receipt Printer module in TakePOS
2020-11-27 19:24:27 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Frédéric FRANCE
1704de39bb Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Laurent Destailleur
47a5037155 Fix dolGetFirstLastname() for 4 and 5 2020-11-27 01:18:01 +01:00
Laurent Destailleur
97f6efb079 Fix avoid to trigger sql injection detection 2020-11-26 23:50:00 +01:00
Laurent Destailleur
b3b511a6d4 FIX #15546 2020-11-26 22:44:11 +01:00
Laurent Destailleur
5d9098795f Fix labels in combo 2020-11-26 19:17:09 +01:00
Laurent Destailleur
084b2411df Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock
NEW show stock in supplier product select list
2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formorder.class.php
	htdocs/fourn/commande/list.php
2020-11-26 18:52:00 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821 NEW show stock in supplier product select list 2020-11-26 14:12:02 +01:00