Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
66381a4f4d FIX #15558 2020-11-29 19:41:11 +01:00
Laurent Destailleur
8eacbaaf5f Merge pull request #15570 from frederic34/strike
simplify function
2020-11-29 19:10:06 +01:00
Laurent Destailleur
5ad1bb5b20 Merge pull request #15571 from frederic34/patch-14
Update mod_codecompta_aquarium.php
2020-11-29 19:08:29 +01:00
Laurent Destailleur
beafcc7853 Fix warning 2020-11-29 16:06:03 +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
Frédéric FRANCE
83c60d725a Update mod_codecompta_aquarium.php 2020-11-28 23:45:32 +01:00
Frédéric FRANCE
3a041eed44 simplify function 2020-11-28 23:42:48 +01:00
Frédéric FRANCE
11a978ca08 simplify function 2020-11-28 23:41:44 +01:00
Frédéric FRANCE
eea9382b57 Update mod_codecompta_aquarium.php 2020-11-28 23:35:27 +01:00
Frédéric FRANCE
f9ef0f4d69 Update mod_codecompta_digitaria.php 2020-11-28 23:33:58 +01:00
Frédéric FRANCE
2f701f4889 Update mod_codecompta_aquarium.php 2020-11-28 23:24:13 +01:00
Frédéric FRANCE
fb871daf14 simplify function 2020-11-28 23:04:05 +01:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01:00
Laurent Destailleur
147a12a922 Fix warning 2020-11-28 15:02:05 +01:00
Laurent Destailleur
41984f9934 Clean code 2020-11-28 14:00:35 +01:00
Laurent Destailleur
b1603ed1f5 Fix warning 2020-11-28 12:12:31 +01:00
Laurent Destailleur
be39e50214 Merge pull request #15567 from andreubisquerra/develop
Improve free entries printing in TakePOS
2020-11-28 02:19:14 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +01:00
Laurent Destailleur
7c4599a5c5 Look and feel v13 2020-11-28 01:15:23 +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
9ce6d87b83 Clean code 2020-11-27 15:04:58 +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
2cf005d22c Removed warning 2020-11-27 00:39:49 +01:00
Laurent Destailleur
250b42f60a Fix phpcs 2020-11-27 00:37:36 +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
9aa657bc35 Debug v13 2020-11-26 18:48:51 +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
Laurent Destailleur
5d0a54c0de Fix var not defined 2020-11-26 12:07:01 +01:00
Laurent Destailleur
e1a6e8f2fc CSS
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1 Fix warning 2020-11-26 10:12:24 +01:00
Laurent Destailleur
e272130a6a Fix phpcs 2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
d8bf7b2714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +01:00
Laurent Destailleur
16e3baeff2 FIX filter on project list 2020-11-25 17:28:53 +01:00
Laurent Destailleur
4d90fb22de Fix sql syntax error 2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/opensurvey/wizard/create_survey.php
2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d Fix delete of proposal 2020-11-25 14:15:59 +01:00