Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

1519 Commits

Author SHA1 Message Date
Frédéric FRANCE
26dff90658 deprecate set_as_client 2023-09-06 14:38:35 +02:00
Laurent Destailleur
3343a47244 NEW billing on shipment+reception. Can be done before or after delivery. 2023-09-03 21:38:11 +02:00
Laurent Destailleur
247ab6a93e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-09-02 20:54:10 +02:00
Laurent Destailleur
bc53cd7643
Merge pull request #25313 from kubajznik/extrafields-support-selectForForms 
NEW #25312 Support extrafields in selectForForms
 2023-09-02 18:40:14 +02:00
Laurent Destailleur
d86bbc623a
Merge branch 'develop' into rest-extra 2023-08-16 02:33:27 +02:00
Laurent Destailleur
aea21bc413 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 15:54:55 +02:00
Laurent Destailleur
119c3fb20d Debug v18 2023-08-15 14:44:03 +02:00
Laurent Destailleur
f21c168a84 Removed $brouillon property 2023-08-06 01:16:12 +02:00
Laurent Destailleur
e3e73d9096 Work on renaming libelle into label 2023-08-06 01:14:36 +02:00
Laurent Destailleur
0076ec69b8 The property ->brouillon has been removed from all classes. It was not 
reliable and was a duplicate of ->status == self::STATUS_DRAFT.
 2023-08-06 00:16:25 +02:00
Laurent Destailleur
ea364ff1a3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 13:47:17 +02:00
Laurent Destailleur
bef9146bb1 Fix warnings 2023-08-05 12:50:09 +02:00
pascal
f9e37412c6 Add filter to restric properties returned 2023-08-03 09:32:43 +02:00
Laurent Destailleur
9302a427a9 Debug v19 2023-07-31 03:29:45 +02:00
Maxime Kohlhaas
bcce9da09d
New : add a dashboard showing number of orders to bill #17963 (#18600) 
* New : add a dashboard showing number of orders to bill #17963

* Fix orders statuses for dashboard and list

* Fix label in dashboard
 2023-07-31 02:36:10 +02:00
Jakub Stříbrný
a73024bec8
add extrafieldmanaged in commande.class.php 2023-07-26 14:54:58 +02:00
jyhere
3681486fe8
FIX: misleading phpdoc (#25342) 2023-07-12 12:27:12 +02:00
Laurent Destailleur
02ca89cf52
Merge pull request #25234 from FHenry/16_fix_calc_update_price_on_update 
FIX: VTA rounding calc option must be the same on update line as on create line
 2023-06-29 17:41:09 +02:00
Florian HENRY
505ea31c30 FIX: TVA calc option must be the same on update line as on create line 2023-06-29 16:50:21 +02:00
Frédéric France
a575b696e7 use user hasRight 2023-06-19 23:27:24 +02:00
hystepik
597b36e57c Fix : php8.1 warnings with strict mode 2023-06-10 10:47:36 +02:00
Laurent Destailleur
80f6af9f4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 19:07:37 +02:00
Laurent Destailleur
89e378bc78 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 19:07:04 +02:00
Je2fb
735ad3d533
Update commande.class.php 
Change function hasdelay and showdelay to use the variable 'delivery_date'
 2023-05-31 21:36:11 +02:00
Frédéric FRANCE
8c0f7f4b65
Update commande.class.php 2023-05-31 13:53:41 +02:00
Frédéric FRANCE
544e82b60c
fix picto tooltip 2023-05-31 13:35:47 +02:00
Laurent Destailleur
86122780a9
Merge pull request #24708 from ptibogxiv/patch-83 
FIX list orders API
 2023-05-16 20:53:05 +02:00
Georgios Papadakis
844524769e
Add missing loading of Societe Class 
Current code relies on Societe Class being already imported by code executed previously, thus in some cases you get a fatal error. I have fatal error of undefined Societe class when i try to sign a Proposal that does not already have an order !!
 2023-05-16 10:07:43 +03:00
ptibogxiv
5a58166614
FIX list orders API 2023-05-08 13:18:42 +02:00
Laurent Destailleur
fe816445f5 Fix warnings 2023-05-01 13:09:09 +02:00
Laurent Destailleur
be835d63ed
Merge pull request #24635 from VMR-Global-Solutions/develop 
API add / fix filter on extrafields in index()
 2023-04-28 20:02:09 +02:00
VMR Global Solutions
926aa6fec7
API add / fix filter on extrafields in index() 
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
 2023-04-28 09:31:33 +02:00
Laurent Destailleur
46e3413e8a Fix tooltips 2023-04-27 15:55:21 +02:00
Laurent Destailleur
2f3cefcc09 Clean code 2023-04-26 11:41:02 +02:00
Laurent Destailleur
c891196b5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-04-25 21:02:01 +02:00
Laurent Destailleur
0bc8227f48 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-25 20:54:15 +02:00
Laurent Destailleur
2e3e6f6899 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-04-25 20:51:40 +02:00
Laurent Destailleur
10e38ec7f9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-04-25 19:14:33 +02:00
Frédéric FRANCE
6f351d5481
load translation for tooltip 
translation was not loaded when using ajax tooltip
 2023-04-25 09:46:12 +02:00
Aloïs Micard
5ec6b29345 Fix order line origin/origin_id when creating from proposal 2023-04-23 14:01:52 +02:00
Laurent Destailleur
8898a1a432 Debug ajax tooltip 2023-04-03 19:51:40 +02:00
Laurent Destailleur
66eb668965
Merge pull request #24164 from frederic34/multidiroutput 
use a fonction to get multidir output
 2023-03-18 10:56:25 +01:00
Laurent Destailleur
9cdb6b7bda
Merge branch 'develop' into customerordertooltip 2023-03-18 10:34:42 +01:00
Jyhere
3e8da8bbe0 FIX: Broken SQL query for order stats when empty societe->client->voir rights 2023-03-16 16:59:31 +01:00
Frédéric FRANCE
c93d615e42 enhance tooltip ajax info 2023-03-14 22:27:35 +01:00
Frédéric FRANCE
1da5de8326 fetch thirdparty in order tooltip only in ajax request 2023-03-13 09:55:47 +01:00
Frédéric FRANCE
a551919f90 fetch thirdparty in order tooltip only in ajax request 2023-03-13 09:54:19 +01:00
Frédéric FRANCE
7fe885fefc Merge remote-tracking branch 'upstream/develop' into multidiroutput 2023-03-09 16:13:19 +01:00
Frédéric FRANCE
a9b9812b7e try to use function 2023-03-08 21:39:05 +01:00
Laurent Destailleur
3f264989ce
Merge pull request #23906 from FliyFly/qodanaincompatible 
Fix (qodana)
 2023-03-08 13:21:14 +01:00
Laurent Destailleur
46945ec44c
Merge pull request #24073 from hregis/fix_multicompany_compatibility2 
TODO remise_percent is a deprecated field for object parent
 2023-03-02 16:31:51 +01:00
Laurent Destailleur
9fd9b0cfa0
Merge branch 'develop' into fix_multicompany_compatibility2 2023-03-02 13:42:40 +01:00
Regis Houssin
ebf766c2e0 FIX deprecated just for remise_percent ! 2023-02-28 16:19:22 +01:00
Regis Houssin
d3c65e390b TODO remise_percent is a deprecated field for object parent 2023-02-28 15:47:33 +01:00
Frédéric FRANCE
2daa9b2dba user hasRight 2023-02-27 10:34:28 +01:00
Frédéric FRANCE
e836cc4f55
use hasRight 2023-02-27 10:24:24 +01:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Frédéric FRANCE
652a215a07 set errors from object 2023-02-24 16:57:39 +01:00
FLIO
29e56ab3cf fix (qodana) edit error and merge develop to be update 2023-02-21 17:51:24 +01:00
Laurent Destailleur
6da47ea49b Fix qodana 2023-02-20 02:33:44 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
FLIO
156922fc51 Fix (qodana) Incompatible return type 2023-02-14 14:09:56 +01:00
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
muhalikin
821b423a24
Fix Shipment Creation from Order via REST API 2023-02-08 15:34:18 +03:00
Frédéric FRANCE
8a5e983d7e clean code 2023-02-06 22:21:54 +01:00
Frédéric FRANCE
b238830c82 keep original label 2023-02-05 23:19:56 +01:00
Frédéric FRANCE
19631fef74 fix tooltip 2023-02-05 20:41:29 +01:00
Frédéric FRANCE
04610763aa Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-04 18:31:40 +01:00
Laurent Destailleur
1f195a3be5 Fix #yogosha14963 2023-02-04 14:04:25 +01:00
Frédéric FRANCE
41dd574b16 clean js 2023-02-02 22:59:54 +01:00
Frédéric FRANCE
7eb0b71252 work on ajax tooltip 2023-01-31 22:47:30 +01:00
Frédéric FRANCE
993c1d28c4 work on ajax tooltip 2023-01-31 22:08:32 +01:00
Frédéric FRANCE
823a7ee72b
fix undeclared properties 2023-01-18 22:37:08 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
cd5009d8a4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 21:21:49 +01:00
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
8ced29cb00 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-11 21:32:41 +01:00
Laurent Destailleur
4f350d878c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-11 21:07:43 +01:00
Laurent Destailleur
577ef4a8a1
Merge pull request #23501 from aspangaro/18a4 
Use isModEnabled()
 2023-01-11 10:29:37 +01:00
Alexandre SPANGARO
8f5edcab02 Use isModEnabled() 2023-01-11 06:11:41 +01:00
Laurent Destailleur
ccf231bc44 Fix sql error 2023-01-09 16:01:20 +01:00
Laurent Destailleur
5280d070e3 Fix technical debt 2023-01-06 19:24:57 +01:00
Laurent Destailleur
27792fe1ad Fix qodana 2023-01-04 18:34:54 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Laurent Destailleur
00fa438c05 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 02:40:22 +01:00
Laurent Destailleur
96f44ab5f8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-03 02:37:14 +01:00
Laurent Destailleur
deb110d556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:13 +01:00
Laurent Destailleur
10674a59bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-03 02:33:59 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Laurent Destailleur
77d6b9510b Clean code 2022-12-28 13:04:11 +01:00
Gauthier PC portable 024
2c7e0afabd FIX : travis 2022-12-21 17:17:33 +01:00
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
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Florian HENRY
f405f859ca ineer join is better than coma and where 2022-12-02 22:49:52 +01:00
Florian HENRY
8ddc4c8db6 FIX: propal and order stats broken on Tag+User(retricted customer list) 2022-12-01 14:28:00 +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
Laurent Destailleur
f87ec74b9f Replace LEFT JOIN with EXISTS 2022-10-22 00:22:54 +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
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +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
Laurent Destailleur
2c2544d471 Fix scrutinizer 2022-05-21 15:31:08 +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
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Eric Seigne
9f2480712b end of #20477 2022-03-29 10:32:14 +02:00
Eric Seigne
53ff837d0f fix #20477: add online_payment_url on orders API requests 2022-03-29 09:48:18 +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
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +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
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +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
Lucas Marcouiller
d1ec71197a Fix : scrutinizer errors 2021-10-23 11:10:58 +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
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
stickler-ci
01a44760a8 Fixing style errors. 2021-08-29 20:14:19 +00:00
lainwir3d
4381f67a64 FIX #18544 Shipment REST API: load thirdparty object into the shipment before validating. 2021-08-30 00:08:43 +04:00
Laurent Destailleur
4ba6b0059d Fix travis 2021-08-28 17:35:42 +02:00
Laurent Destailleur
2aa3eb3857
Merge pull request #18521 from Hystepik/develop#2 
Close #18074 : REST API New /order/{id}/shipment get & post
 2021-08-28 14:44:31 +02:00
Laurent Destailleur
049992aed4
Update api_orders.class.php 2021-08-28 14:44:13 +02:00
Laurent Destailleur
3585259b55
Update api_orders.class.php 2021-08-28 14:43:17 +02:00
Laurent Destailleur
d98390e675
Update api_orders.class.php 2021-08-28 14:42:31 +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
lmarcouiller
b9039eea14 FIx warehouse limit testing 2021-08-27 10:45:04 +02:00
lmarcouiller
eb48566798 Close #18074 : New /order/{id}/shipment get & post 2021-08-27 10:40:33 +02:00
lmarcouiller
c70813d718 New : rest api POST orders shipment 2021-08-26 17:03:00 +02:00
lmarcouiller
f482be84bf New : rest api GET orders shipements 2021-08-26 12:35:31 +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
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
 2021-06-04 11:04:18 +02:00
Florian HENRY
c91b9d613a FIX: order supplier stats by category now display figures 2021-06-01 15:30:17 +02:00
Laurent Destailleur
200c36836b v14 2021-05-11 10:44:53 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +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