Commit Graph

85038 Commits

Author SHA1 Message Date
Laurent Destailleur
4a012c13b2 FIX Translation of tooltips of extrafields 2020-03-26 19:47:28 +01:00
Laurent Destailleur
2f94db6ffe FIX Translation of tooltips of extrafields 2020-03-26 19:46:36 +01:00
Bahfir Abbes
f7ecc9d60c
Fix:The column "print $langs->trans("StockCorrection");" is now duplicated. 2020-03-26 15:22:24 +01:00
stickler-ci
38029abcb1 Fixing style errors. 2020-03-26 08:34:27 +00:00
Tobias Sekan
1e13dbe270
fix non numeric error 2020-03-26 09:29:35 +01:00
Tobias Sekan
4624fd2445
Fix add mulitcurrency line in supplier proposal 2020-03-26 09:23:19 +01:00
atm-quentin
cef65a3c8f FIX hook name and useless inithook 2020-03-26 09:20:14 +01:00
Tobias Sekan
f7762f11db
Fix change multicurrency line in supplier proposal 2020-03-26 09:13:56 +01:00
Tobias Sekan
9b4974412b
Merge pull request #11 from Dolibarr/develop
pull from develop
2020-03-26 08:58:26 +01:00
stickler-ci
208049a8f2 Fixing style errors. 2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c set as global 2020-03-26 08:24:20 +01:00
Laurent Destailleur
c9696114f4 Fix scrutinizer 2020-03-26 04:30:16 +01:00
Laurent Destailleur
63b04ac9ca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
2020-03-26 04:10:07 +01:00
Laurent Destailleur
947ccf0892 Fix travis 2020-03-26 03:59:45 +01:00
Laurent Destailleur
30379b4cba Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	.travis.yml
2020-03-26 03:57:02 +01:00
Laurent Destailleur
5a5863f46a FIX Group by invalid with pgsql 2020-03-26 03:55:34 +01:00
Laurent Destailleur
81ae6c45ea composer is a big mess 2020-03-26 03:47:58 +01:00
Laurent Destailleur
39f7742387 Update travis config 2020-03-26 03:46:39 +01:00
Laurent Destailleur
386d478b65 Add os in travis 2020-03-26 03:44:58 +01:00
Laurent Destailleur
ddf233f2ed Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	.travis.yml
2020-03-26 03:39:46 +01:00
Laurent Destailleur
5fdf23bba8 Fix exclude fucking composer dependencies 2020-03-26 03:36:16 +01:00
Laurent Destailleur
fb5363d857 Fix pregex 2020-03-26 03:32:05 +01:00
Laurent Destailleur
84fc394e6f Fix exclude fucking composer dependencies 2020-03-26 03:29:29 +01:00
Laurent Destailleur
004397304e FIX Foreign currency lost when splitting a discount 2020-03-26 02:32:53 +01:00
Laurent Destailleur
f0de10897a FIX Foreign currency lost when splitting a discount 2020-03-26 02:32:24 +01:00
Laurent Destailleur
3ae3e9a16e Remove $_POST 2020-03-26 02:21:50 +01:00
Laurent Destailleur
d3debccabe FIX bad value in currency into discount created from down payment 2020-03-26 02:14:57 +01:00
Laurent Destailleur
d2163c95d6 Save the vat src code when converting down payment into discount 2020-03-26 02:13:34 +01:00
Laurent Destailleur
fa3bba942f Start to save the VAT src code into table of discounts to reuse them
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
88d98acbba FIX #13410
Conflicts:
	htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
a05f9fad33 FIX Look and feel v11 2020-03-26 01:25:10 +01:00
Laurent Destailleur
ab19bb2455 FIX default value of selectMasssAction broken 2020-03-26 01:25:05 +01:00
Laurent Destailleur
ba000dbcfd FIX #13410 2020-03-26 01:24:27 +01:00
Laurent Destailleur
82825f143b FIX Look and feel v11 2020-03-26 01:24:05 +01:00
Laurent Destailleur
90e0ead953 FIX default value of selectMasssAction broken 2020-03-26 00:52:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
2e5bfb207f Fix responsive 2020-03-25 23:50:05 +01:00
andreubisquerra
d420656c3f
Update langs 2020-03-25 21:32:58 +01:00
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS 2020-03-25 21:30:33 +01:00
andreubisquerra
3e4b788316
Update receiptprinter.php with CUPS 2020-03-25 21:23:55 +01:00
Laurent Destailleur
e937b22721 Increase batch number to 128 2020-03-25 19:34:52 +01:00
Laurent Destailleur
04f0cdac18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-25 19:30:06 +01:00
Laurent Destailleur
4e77413996 Try fix suggested in #13418 2020-03-25 19:29:54 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
8820fa6ca5
Merge pull request #13420 from TobiasSekan/NewAddCategoryFromSubCat
NEW show "New category" button in top of sub categories list
2020-03-25 18:48:43 +01:00
Laurent Destailleur
b48c21dbcb If we need more var here, we must fix to have var starting with search_ 2020-03-25 18:47:42 +01:00
Laurent Destailleur
e160ea2bee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-25 18:45:55 +01:00
Laurent Destailleur
a7ba23d845
Merge pull request #13419 from atm-gauthier/9.0_search_status_on_bookmarks
FIX : when we filter a list on a view status, we want this filter to …
2020-03-25 18:44:40 +01:00
Laurent Destailleur
33fe7b5f70
Merge pull request #13416 from simnandez/11.0
FIX: Compatibility with multicompany, bad numerotation of task.
2020-03-25 18:40:13 +01:00