Commit Graph

572 Commits

Author SHA1 Message Date
kamel
a4800f7b9b FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:18:27 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
47465f4108 Fix for situation invoice (exclude credit not when searching last
invoice to use)
2020-05-25 00:20:00 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Tobias Sekan
58e32aa2ff Fix not wokring default values for date (re...) 2020-05-23 14:22:30 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
FIX not working default date values for new invoices
2020-05-23 14:21:50 +02:00
stickler-ci
2873f4dacf Fixing style errors. 2020-05-22 06:08:12 +00:00
Tobias Sekan
53080be245
fix not working default values for payment 2020-05-22 08:01:29 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Tobias Sekan
2efe3d7da0
Fix not wokring default values for date (re...) 2020-05-21 09:31:06 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
Laurent Destailleur
4c27ae6530 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Laurent Destailleur
21665cdc85 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552 FIX Situation invoice take into account the credit notes. 2020-04-24 15:57:08 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Frédéric FRANCE
5992318af7
Update card.php 2020-04-19 21:49:37 +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
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
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
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
ATM john
81adc6913e change conf usage 2020-04-01 12:12:30 +02:00
ATM john
79fe664365 fix merge not applied 2020-03-31 16:43:38 +02:00
stickler-ci
004d9381f5 Fixing style errors. 2020-03-31 14:36:42 +00:00
ATM john
c466beea3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-03-31 16:28:43 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +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
88d98acbba FIX #13410
Conflicts:
	htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
ba000dbcfd FIX #13410 2020-03-26 01:24:27 +01:00