Commit Graph

1193 Commits

Author SHA1 Message Date
Gauthier PC portable 024
69b0cf9bcf FIX : include class multicurrency 2022-12-21 14:05:54 +01:00
stickler-ci
3b9d39c1d2 Fixing style errors. 2022-12-21 10:00:26 +00:00
Gauthier PC portable 024
0582653a67 FIX : get multicurrency infos of propal when create order from propal with "WORKFLOW_PROPAL_AUTOCREATE_ORDER" conf 2022-12-21 10:55:03 +01:00
Francis Appels
b3aef891e2 FIX trigger LINEORDER_DELETE, extrafields should be removed after delete trigger. 2022-12-20 10:24:43 +01:00
Laurent Destailleur
ce5bb5cd64 Fix warning 2022-11-24 22:49:37 +01:00
Laurent Destailleur
08985fbe62
Merge pull request #22792 from noec764/14_FIX_Add_Missing_LibStatut_Hooks
FIX: Add Missing "LibStatut" hooks in propal, commande, facture
2022-11-09 15:39:43 +01:00
stickler-ci
89876d8d52 Fixing style errors. 2022-11-08 15:24:05 +00:00
Noé Courtier
73b857c1b3 FIX: Add Missing "LibStatut" hook in propal, commande, facture 2022-11-08 16:21:32 +01:00
Laurent Destailleur
290d02c0df
Merge pull request #22627 from noec764/14_FIX_Invoice_Order_FetchLines
FIX: Missing return 0 if object not found
2022-10-24 19:45:41 +02:00
Noé Courtier
477f5e2890 FIX: Missing return 0 if object not found 2022-10-19 11:53:17 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Alexandre SPANGARO
58ac8d196c Use isModEnabled 2022-09-25 06:01:40 +02:00
Philippe GRAND
fb9db96ecc update code toward php8 compliance 2022-09-24 14:37:57 +02:00
Laurent Destailleur
e1b5e5033f Clean code of deprecated field 2022-09-23 09:35:17 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Laurent Destailleur
209bf00b69 Trans 2022-09-13 00:12:57 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
7997776cbb Update code 2022-09-03 11:12:52 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Philippe GRAND
9ba54b502d update code 2022-09-01 09:41:59 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
81c13bcc4c update code 2022-08-31 22:03:33 +02:00
UT from dolibit
c6c5ddd485
Update commande.class.php 2022-08-27 13:55:27 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
BENKE Charlene
710e556845
fix $fk_product instead $this->fk_product
$fk_product not present on $commande object
2022-06-20 16:07:22 +02:00
Laurent Destailleur
28234c6f44
Merge pull request #21276 from badre-agtaib/scru4
FIX bug :The properties product_tosell & product_tobuy do not exist on OrderLine
2022-06-15 11:05:34 +02:00
bagtaib
22152dd254 declaring the propreties product_tosell & product_tobuy 2022-06-15 00:50:34 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
bagtaib
267a6f908d The properties product_tosell & product_tobuy do not exist on OrderLine 2022-06-14 17:26:18 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
755bce9fe1 Fix : date_creation must have visible=-2 2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
4162a02cc1 Fix deprecated remise must be remove from insert 2022-05-20 20:10:45 +02:00
Laurent Destailleur
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
38aced687b Fix scrutinizer 2022-05-18 23:52:43 +02:00
stickler-ci
f70a9ad04c Fixing style errors. 2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
da2a8a59f3 Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function 2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279 NEW : update rank line is possible on API for orders propal and supplier invoice 2022-05-11 14:26:21 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge
can merge products
2022-04-07 15:02:03 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
2022-04-02 10:31:58 +02:00
Laurent Destailleur
9389b96d1d
Merge pull request #20478 from rycks/develop
fix #20477: add online_payment_url on orders API requests
2022-04-01 14:47:38 +02:00
Eric Seigne
1589afde19 fix #20477 : add online_payment_url as public var 2022-03-30 14:06:15 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Frédéric FRANCE
7291bbf710
tooltip order date is date not datetime
from sql table
date_commande date, -- date de la commande
2022-03-10 13:52:05 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Laurent Destailleur
88b9123a93
Merge pull request #19989 from iouston/patch-2
add target attribute on getNomUrl
2022-03-07 17:10:39 +01:00
Laurent Destailleur
d0ca8af6ee
Update commande.class.php 2022-03-07 17:10:28 +01:00
Laurent Destailleur
660aa7b282
Update commande.class.php 2022-03-07 17:10:00 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
bd288f980d FIX On large proposal or invoice, fix n(n+1) sql into a n sql. 2022-03-01 14:52:47 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0
More generic management of parentline
2022-02-16 20:25:04 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
09c9b28b57
Update commande.class.php 2022-02-15 11:02:22 +01:00
Frédéric FRANCE
c90f9b5681
add hook in order tooltip 2022-02-15 10:51:06 +01:00
Christophe Battarel
01ef9b64ee fix parent line on create with no originid 2022-02-15 10:34:10 +01:00
iouston
4808442bc8
keep the default value for target in getnomurl to '' 2022-02-15 09:34:51 +01:00
iouston
993e0d852c
fix parameter name 2022-02-04 15:01:32 +01:00
stickler-ci
e8801bd7fc Fixing style errors. 2022-02-04 13:42:07 +00:00
iouston
95aabd6ae3
add target attribute on getNomUrl 2022-02-04 14:38:34 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
ptibogxiv
928075bbf6
fix error in commande.class.php 2022-01-26 20:13:10 +01:00
Laurent Destailleur
8dbadc0aa8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 14:12:06 +01:00
Laurent Destailleur
6b5c0769b8 FIX #19786 2022-01-24 14:09:53 +01:00
ptibogxiv
b89947ff7c Update commande.class.php 2022-01-20 19:58:31 +01:00
ptibogxiv
56dd41324c Update commande.class.php 2022-01-20 19:57:48 +01:00
ptibogxiv
accb0deb29
New support user_modif in order 2022-01-16 00:13:14 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Laurent Destailleur
19efa37e4b Fix default value #19562 2021-12-19 20:55:24 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc FIX : use $linecount = count($this->lines); 2021-11-23 10:44:43 +01:00
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Marc de Lima Lucio
7e059c0a22 NEW: deposit payment terms: futureproof evolutions by storing field as a string 2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Marc de Lima Lucio
47deb64f09 FIX: deposit payment terms: sql syntax error 2021-10-05 14:19:47 +02:00
Marc de Lima Lucio
004b52f590 NEW: deposit payment terms: add field into CRUD methods 2021-09-29 12:05:38 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
fc56b88a1f FIX select list of orders not complete when field type of company is on 2021-09-28 13:44:42 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
58ca982e55 Fix trans 2021-08-04 14:01:57 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
b8f5dc74d7 Some order php 8 warning 2021-06-29 16:30:36 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Laurent Destailleur
1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Francis Appels
69affc5df5 Fix php 8 warnings 2021-06-28 16:25:16 +02:00
Maxime Kohlhaas
c3cbd29542 Fix #17836 : order delay warning in list was wrong, date_commande is deprecated 2021-06-27 09:04:47 +02:00
stickler-ci
26f72b7fff Fixing style errors. 2021-06-19 12:58:08 +00:00
Laurent Destailleur
3669600242
Update commande.class.php 2021-06-19 14:55:41 +02:00
Laurent Destailleur
194637cfda
Merge branch 'develop' into oldline 2021-06-19 14:54:44 +02:00
Laurent Destailleur
dfa5c419b3
Update commande.class.php 2021-06-19 14:52:06 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
200c36836b v14 2021-05-11 10:44:53 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
b702d2b534 Fix CSRF for more GET 2021-03-29 22:58:44 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
0e645aefbd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-16 15:15:50 +01:00
Laurent Destailleur
59174315ae Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-16 15:15:12 +01:00
Laurent Destailleur
a29a9e5435 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0
correct nb_expedition count
2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f correct nb_expedition count 2021-03-16 15:00:46 +01:00
Florian HENRY
cdf5d2399a fix warning 2021-03-15 19:07:40 +01:00
Frédéric FRANCE
d6f6097f4a
fix php8 warning 2021-03-15 11:54:16 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +01:00
Frédéric FRANCE
6dfca9f1f5
code syntax commande directory 2021-02-23 20:46:19 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
6dfc6c7edf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/filefunc.inc.php
2021-02-11 18:33:03 +01:00
Laurent Destailleur
c306e8ebe9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-11 18:23:47 +01:00
Frédéric FRANCE
097ff0d7b6
Update commande.class.php 2021-02-09 22:14:46 +01:00
ptibogxiv
e5f6a64846
FIX update order by api
fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)
2021-02-09 19:24:36 +01:00
Laurent Destailleur
92a19c0caa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
2021-02-09 18:34:50 +01:00
Laurent Destailleur
1f441deb5d
Merge pull request #16237 from AlexisLaurier/13.0
13.0 - Fix db begin() not closed into commande.class.php
2021-02-09 18:06:36 +01:00
LAURIER Alexis
abf2875eba
commande.class.php - move db->begin() into cloture
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
2021-02-09 14:25:45 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions 2021-02-09 13:25:55 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
bcfe03216a FIX error managent and db transaction balance 2021-01-14 19:15:54 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
bad4b14ba5 Fix properties 2021-01-12 10:34:15 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00
Laurent Destailleur
1b69b1c2fe Fix phpcs 2020-12-16 10:39:10 +01:00
Laurent Destailleur
69061e422b Removed warning 2020-12-16 02:44:48 +01:00
Laurent Destailleur
b991badb8c Fix warning 2020-12-14 13:03:43 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Cédric
dcc3ecf012
Update commande.class.php 2020-12-03 16:01:17 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +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
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
69b06a25e8 Fix code of deletion of objects 2020-11-26 09:16:16 +01:00
Frédéric FRANCE
83f6e9dfc2
doxygen 2020-11-25 18:08:13 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
1dd697767e
Merge branch 'develop' into 13_doc 2020-11-18 18:08:14 +01:00
Laurent Destailleur
6150d3bb2c
Merge pull request #15430 from fappels/13_fix_supplier_barcode
Improve doc for customer order delivery date
2020-11-18 12:54:34 +01:00
Francis Appels
9936d8c559 Revert "doc for delivery_date"
This reverts commit aed6afc3bf.
2020-11-16 17:54:52 +01:00
Francis Appels
aed6afc3bf doc for delivery_date 2020-11-16 17:37:38 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
96b15420f0 Fix regression 2020-11-16 12:56:13 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
5be634cbd4 Clean code 2020-11-09 11:34:58 +01:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
50cf7704fe Log 2020-10-27 18:30:03 +01:00
Francis Appels
93ab281d81 Fix tab indent 2020-10-26 18:21:47 +01:00
Francis Appels
91496682fb Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison 2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a Move phpcs enable to correct location @frederic34 2020-10-26 18:13:25 +01:00
stickler-ci
d803c7f429 Fixing style errors. 2020-10-26 16:06:05 +00:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function.
Use correct naming convention for new method naming.
2020-10-26 16:50:52 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
2020-10-25 14:48:51 +01:00