Commit Graph

1097 Commits

Author SHA1 Message Date
stickler-ci
7514a625fd Fixing style errors. 2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php
Auto-update dates (if not empty) of services when cloning facture.

Actual code is only for month by month.

If empty (start or end) => do nothing

If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month

Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
2020-05-07 22:09:55 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
731864eb4a Removed useless translation keys 2020-04-25 12:43:41 +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
b77892451f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 16:21:58 +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
b2b580f6fb Report error 2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad Report error 2020-04-24 15:21:02 +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
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
stickler-ci
aebc04d30a Fixing style errors. 2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02:00
Laurent Destailleur
3a9add0e70 FIX #13663 2020-04-23 13:37:43 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02: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
ATM john
81adc6913e change conf usage 2020-04-01 12:12:30 +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
d2163c95d6 Save the vat src code when converting down payment into discount 2020-03-26 02:13:34 +01:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
303961b0a6 Fix trans 2020-03-19 12:10:22 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
ATM john
d3aeec0a7c Fix situation value transmission 2020-03-18 10:30:15 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
VESSILLER
1379b2ce87 FIX travis errors 2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink 2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5 NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type 2020-03-12 09:44:43 +01:00
Laurent Destailleur
3edc3dd382 Fix fields definition 2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d Fix table fields 2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
0b37c2c201 FIX #13263 2020-03-04 00:53:07 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Laurent Destailleur
46bf65704a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Alexandre SPANGARO
da99c89c26 FIX: typo on ckeck method 2020-03-01 05:21:51 +01:00
ATM john
4865e34cc2 fix missing visibility 2020-02-25 23:02:13 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
ATM john
13790422dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-24 00:18:37 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
2020-02-23 22:49:03 +01:00
ATM john
4117aa56a2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-22 11:19:49 +01:00
Frédéric FRANCE
8d507c4f32 fix workflow with multicurrency 2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7
fix workflow with multicurrency
2020-02-21 18:12:27 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
VESSILLER
ec19b2feef FIX phpcs nestling too high level 2020-02-21 12:00:16 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency 2020-02-20 15:11:31 +01:00
stickler-ci
028566616d Fixing style errors. 2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4 extend retained warranty to be available for all invoices 2020-02-19 11:54:55 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
9f9002d6a6 Update field definition 2020-02-07 16:05:04 +01:00
Laurent Destailleur
fe7b79c83c Fix definition of objects 2020-02-07 15:51:14 +01:00
Laurent Destailleur
d827e3289a Removed no more used field "amount" in llx_facture 2020-01-31 15:12:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
e796a2eda9 Add fields array on common objects 2020-01-29 22:38:14 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
2020-01-27 09:49:49 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
VESSILLER
c39e45b81a FIX set due date in object in create invoice 2019-12-23 10:57:51 +01:00
Laurent Destailleur
138215fc3f Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
european users.
2019-12-16 22:30:16 +01:00
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
2f3b4d239b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:12 +01:00
Laurent Destailleur
5b6f0cb101 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
gauthier
a5635825f3 FIX : wrong invoice id for fetchObjetctLinked 2019-11-14 12:09:32 +01:00
Laurent Destailleur
3430a88c72 Fix $conf not defined 2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
c7e261a973 FIX #11907 2019-11-07 14:40:26 +01:00
Laurent Destailleur
17d5c385ff FIX #12320 It is clearer that you can't change thirdparty when creating
invoice from template with a recurring rule.
2019-11-05 15:46:48 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
a16b7bcda6
cut long lines 2019-10-19 19:16:28 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-14 20:39:08 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
Laurent Destailleur
28339920b3 Translation 2019-10-14 16:00:03 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
ro@t.com
2149b155d1 ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning 2019-10-10 15:57:26 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
Laurent Destailleur
2da5a506a9
Update facture.class.php 2019-09-30 18:25:03 +02:00
Laurent Destailleur
564e22009d
Update facture.class.php 2019-09-30 18:22:37 +02:00
ptibogxiv
4177c72ae0
Update facture.class.php 2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e
Update facture.class.php 2019-09-29 15:45:41 +02:00