Commit Graph

9810 Commits

Author SHA1 Message Date
Laurent Destailleur
018cfdf54b FIX Field balance before and after sometimes not visible in bank entries 2020-04-18 16:14:37 +02:00
Laurent Destailleur
de74c447cc Fix sanitize amount 2020-04-18 16:05:26 +02:00
Laurent Destailleur
2f2e3d5057 Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
NEW : Extend retained warranty to be  available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
b0515c626b Look and feel v12 2020-04-18 00:09:24 +02:00
Laurent Destailleur
ee26390f89 Look and feel v12 2020-04-17 19:15:22 +02:00
Laurent Destailleur
6fd34f592d Fix default value 2020-04-17 19:07:30 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
ptibogxiv
284f269213 Update api_bankaccounts.class.php 2020-04-15 19:32:45 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
ATM john
e6669348e1 Fix dom manipulation on creation 2020-04-15 11:09:34 +02:00
ATM john
4b4f69c76a fix indentation 2020-04-15 10:52:28 +02:00
stickler-ci
e6b29aa0f0 Fixing style errors. 2020-04-15 08:48:45 +00:00
ATM john
a9c9292137 Merge branch '12.0_new_extend_retained_warranty' of github.com:atm-john/dolibarr into 12.0_new_extend_retained_warranty 2020-04-15 10:45:53 +02:00
ATM john
9a1993f71c Fix retained warranty default value 2020-04-15 10:44:07 +02:00
stickler-ci
cbf6afb4a0 Fixing style errors. 2020-04-14 12:13:38 +00:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
Laurent Destailleur
a72b262f5b FIx #13592
Conflicts:
	htdocs/compta/bank/line.php
2020-04-13 14:52:06 +02:00
Laurent Destailleur
4ab3bf99ec FIx #13592 2020-04-13 14:50:55 +02:00
Laurent Destailleur
b54e3fb18c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-13 14:39:10 +02:00
Laurent Destailleur
f726fcdcd8 FIX #13593 2020-04-13 14:32:15 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
b6baba7651 Removed deprecated var 2020-04-12 18:59:22 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
4a6ffd2619 Merge pull request #13570 from frederic34/patch-6
Add table_ref_field to facture-rec class
2020-04-12 17:17:43 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Frédéric FRANCE
251f6d0cb1 Update facture-rec.class.php 2020-04-11 22:53:45 +02:00
Frédéric FRANCE
e9aa27d731 Update facture-rec.class.php 2020-04-11 21:06:33 +02:00
Laurent Destailleur
760121a3d1 Can sort list of answers. 2020-04-11 14:13:16 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
Laurent Destailleur
0845f0bcd3 Merge pull request #13523 from bb2a/patch-2
add  in default search
2020-04-10 12:12:28 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Anthony Berton
96f1c961b7 Update list.php 2020-04-10 10:55:14 +02:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Laurent Destailleur
3a024124e8 Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
efd6d14c1a Merge pull request #13505 from atm-florian/develop
fix php warning
2020-04-08 14:40:59 +02:00
Laurent Destailleur
215c7b0e32 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/compta.lang
2020-04-08 11:42:43 +02:00
Laurent Destailleur
146ead4d04 Code comment 2020-04-08 11:39:22 +02:00
Laurent Destailleur
df81065f73 MAIN_VIEW_LINE_NUMBER_IN_LIST 2020-04-08 11:23:31 +02:00
stickler-ci
0ce44251f7 Fixing style errors. 2020-04-08 08:50:16 +00:00
Tobias Sekan
23645b7865 Add confirm for delte file in facture 2020-04-08 10:30:51 +02:00
Laurent Destailleur
8e7ad726b2 NEW Easier way to setup the different types of tax. Better visibility.
FIX edit of tax stamp regenerated the PDF.
2020-04-07 14:06:08 +02:00
Laurent Destailleur
ff1b3db54b Fix regression on hamburger picto 2020-04-06 23:38:30 +02:00
florian HENRY
48da8c315f fix php warning 2020-04-06 12:21:20 +02:00
Laurent Destailleur
03b09f1d28 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 12:14:03 +02:00