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
126,990 Commits 35 Branches 179 Tags 1.7 GiB
c2c99ab2b8
Commit Graph

4352 Commits

Author SHA1 Message Date
Laurent Destailleur
119c3fb20d Debug v18 2023-08-15 14:44:03 +02:00
Laurent Destailleur
11ad17bcf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 15:00:52 +02:00
Laurent Destailleur
bdd1d89101 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-08 22:08:25 +02:00
Laurent Destailleur
b0e4558e3f Fix #25586 2023-08-08 21:53:52 +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
40ebf86eab Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 13:51:32 +02:00
Laurent Destailleur
66c1ba9ae9 Debug v18 2023-07-31 03:47:37 +02:00
Laurent Destailleur
9302a427a9 Debug v19 2023-07-31 03:29:45 +02:00
Laurent Destailleur
f901827556 Fix condition 2023-07-31 02:41:03 +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
Laurent Destailleur
e9273d6183 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/receipt.php
 2023-07-19 04:19:15 +02:00
jyhere
3681486fe8
FIX: misleading phpdoc (#25342) 2023-07-12 12:27:12 +02:00
Laurent Destailleur
e203346b2a Debug v18 2023-07-10 20:53:19 +02:00
Laurent Destailleur
f18fae5271 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-06 22:24:35 +02:00
Laurent Destailleur
86864b4d53 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-06 22:22:26 +02:00
Laurent Destailleur
2a9f4da015 FIX #25290 FIX #25287 FIX #25288 2023-07-06 22:02:23 +02:00
Laurent Destailleur
f0ed7b436b Fix for #25290 2023-07-06 20:03:22 +02:00
Laurent Destailleur
eb22ebced9 Fix int 2023-07-06 19:57:09 +02:00
Laurent Destailleur
8e7d9578ca Typo 2023-07-03 21:57:43 +02:00
Laurent Destailleur
325827531a Close table 2023-07-03 21:14:04 +02:00
Sylvain Legrand
c33d86e1df Extend the IMPORT_LINKED_OBJECT_LINES option to invoices 2023-07-03 07:00:36 +03:00
Laurent Destailleur
e01f05cf96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-02 21:16:50 +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
e74d8fa54d use isModEnabled 2023-06-29 14:04:39 +02:00
Laurent Destailleur
c2a5e834e1
Merge pull request #25216 from frederic34/20230627 
use isModEnabled
 2023-06-28 16:18:53 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Frédéric France
81fbdacf8e use isModEnabled 2023-06-27 21:31:36 +02:00
Frédéric France
a575b696e7 use user hasRight 2023-06-19 23:27:24 +02:00
Frédéric France
647708a9bc use user hasRight 2023-06-19 23:05:59 +02:00
Laurent Destailleur
6b94d60d9a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-16 01:36:46 +02:00
Frédéric France
c38d851944 Merge remote-tracking branch 'upstream/develop' into 20230614 2023-06-15 20:22:27 +02:00
Laurent Destailleur
dc69e568e1 Fix look and feel v18 2023-06-15 15:05:15 +02:00
Frédéric FRANCE
740ac26277 use user hasRight 2023-06-14 19:54:16 +02:00
Frédéric France
0cb70110eb use user hasRight 2023-06-12 20:10:42 +02:00
hystepik
597b36e57c Fix : php8.1 warnings with strict mode 2023-06-10 10:47:36 +02:00
hystepik
085643edd6 fix impossibility to add default filter for search_billed 2023-06-09 12:29:23 +02:00
Laurent Destailleur
9fa0439d3e
Merge pull request #24961 from frederic34/2023_06_05 
use user hasRight
 2023-06-07 18:53:51 +02:00
Laurent Destailleur
d703e01314
Merge pull request #24963 from FliyFly/editcommandeattribute 
fixing the total ttc in the multicurrency section
 2023-06-07 18:50:37 +02:00
FLIO
819e44fb7c fixing the total ttc in the multicurrency section 2023-06-06 00:12:33 +02:00
Frédéric France
5a018d715d use user hasRight 2023-06-06 00:05:02 +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
Laurent Destailleur
0766bd8e7a
Merge pull request #24929 from fappels/18_debug_list_det 
Debug Lines of order page.
 2023-06-04 17:59:57 +02:00
Laurent Destailleur
8756be5ebf
Merge pull request #24926 from frederic34/patch-2 
fix picto tooltip
 2023-06-04 15:20:06 +02:00
Laurent Destailleur
ebfe632efe Debug v18 2023-06-03 15:33:46 +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
Francis Appels
a322ba85fe Only show subtotal when sorted by product. 2023-05-31 15:43:24 +02:00
Francis Appels
44996553a0 get shippable status for line, so you know which line is shippable (no need to loop order lines) 2023-05-31 15:36:29 +02:00
Francis Appels
8d3f1ca9c2 Remove unexisting massaction 2023-05-31 15:15:26 +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
Laurent Destailleur
ebdd397d7c
Merge pull request #24779 from FliyFly/editcommandeattribute 
New attributes on commande card
 2023-05-16 19:42:24 +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
FLIO
e93b087012 New attributes on commande card 2023-05-15 23:54:44 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
ptibogxiv
5a58166614
FIX list orders API 2023-05-08 13:18:42 +02:00
stickler-ci
13348ede59 Fixing style errors. 2023-05-05 16:22:49 +00:00
NextGestion
e8acd50626 Object line : Prevent adding Free line when the option "MAIN_DISABLE_FREE_LINES" is activated (Proposal, invoice, order, contract) 2023-05-05 17:15:49 +01:00
Laurent Destailleur
7a781840ca Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-03 04:54:49 +02:00
Laurent Destailleur
a1d6e55189 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-03 02:40:32 +02:00
Laurent Destailleur
fe816445f5 Fix warnings 2023-05-01 13:09:09 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +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
Laurent Destailleur
54c8176cc9
Merge pull request #24641 from fappels/develop_order_msg 
Add missing error message on modify order error.
 2023-04-28 19:59:17 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
Laurent Destailleur
cd949e9fa7 Fix error message not shown 2023-04-28 12:37:01 +02:00
Francis Appels
cec58e5631 Add missing error message on modify order error. 2023-04-28 10:48:50 +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
f44c97d3c6 Code is using the Universal Filter Syntax 2023-04-27 22:12:23 +02:00
Laurent Destailleur
3065b9ca6a Clean code 2023-04-27 21:15:27 +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
Erik van Berkum
ec9fb80c02 fix: typo in constant MAIN_AUTOFILL_DATE_ORDER 2023-04-23 14:55:10 +09:00
Erik van Berkum
20b51db72c Revert "fix: typo in constant MAIN_AUTOFILL_DATE_ORDER" 
This reverts commit 9a27d025a7.
 2023-04-23 14:54:12 +09:00
Erik van Berkum
dd60d20019 Merge remote-tracking branch 'origin/develop' into develop 2023-04-23 14:52:32 +09:00
Erik van Berkum
9a27d025a7 fix: typo in constant MAIN_AUTOFILL_DATE_ORDER 2023-04-23 14:47:54 +09:00
Frédéric FRANCE
fee9dec15a use isModEnabled 2023-04-19 13:58:08 +02:00
Frédéric FRANCE
2f4fe9d619 use isModEnabled 2023-04-19 09:07:55 +02:00
Frédéric FRANCE
1d634557ce Merge remote-tracking branch 'upstream/develop' into use_ismodenabled 2023-04-18 23:40:57 +02:00
Laurent Destailleur
272a0030b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-18 20:38:55 +02:00
Laurent Destailleur
f8d3c28e68 Look and feel v18 2023-04-18 20:37:42 +02:00
Frédéric FRANCE
a38a303e1c use isModEnabled 2023-04-18 20:23:34 +02:00
Laurent Destailleur
31b2c961cd
Merge pull request #24502 from jyhere/jyhere-patch-7 
FIX: undefined variable used in order billing mass action
 2023-04-18 17:28:27 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
Laurent Destailleur
8e51bf2c55 Debug 18 2023-04-18 14:04:27 +02:00
jyhere
2fbfd4fe4c
FIX: undefined variable used in order billing mass action 2023-04-13 14:27:27 +02:00
Laurent Destailleur
0fb03fdc2d Clean code 2023-04-08 01:43:21 +02:00
Laurent Destailleur
e088eb12e6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-05 01:18:55 +02:00
Laurent Destailleur
3b9853f7d3 FIX More complete fix for #24411 2023-04-04 22:45:30 +02:00
Laurent Destailleur
5ba1f2dc56
Update list.php 2023-04-04 22:38:05 +02:00
Laurent Destailleur
8898a1a432 Debug ajax tooltip 2023-04-03 19:51:40 +02:00
Anthony Berton
e120780c6c FIX - Filter status order in list 2023-04-01 16:53:54 +02:00
Laurent Destailleur
a50c0b8292 Fix missing include 2023-03-19 14:56:07 +01:00
Laurent Destailleur
ec43a8626e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-03-18 14:37:48 +01:00
Laurent Destailleur
dc2cb7fbb3 NEW Add dropdown button actions (example on Create button on project) 2023-03-18 14:10:23 +01: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
Laurent Destailleur
b97b85fa8c Look and feel v18 2023-03-14 12:05:25 +01:00
Frédéric FRANCE
7c6624e27d Merge remote-tracking branch 'upstream/develop' into customerordertooltip 2023-03-13 13:59:51 +01:00
Laurent Destailleur
f29d5c7844 Bettr order for mass action 2023-03-13 13:17:49 +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
7576099575 fix reload customer invoice 2023-03-10 10:19:26 +01:00
Frédéric FRANCE
b369f347cd fix reload customer order 2023-03-10 10:13:51 +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
Frédéric FRANCE
24f77465cc use a fonction to get multidir output 2023-03-08 21:16:37 +01:00
Laurent Destailleur
3f264989ce
Merge pull request #23906 from FliyFly/qodanaincompatible 
Fix (qodana)
 2023-03-08 13:21:14 +01:00
Frédéric FRANCE
f24a2608d2 add pictos 2023-03-03 14:04:16 +01:00
Frédéric FRANCE
52856303d9 add pictos on forms 2023-03-03 12:06:27 +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
Frédéric FRANCE
9f23bac505 use hasRight 2023-02-20 18:55:52 +01:00
Laurent Destailleur
6da47ea49b Fix qodana 2023-02-20 02:33:44 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +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
Laurent Destailleur
cd2e82f4a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Frédéric FRANCE
8a5e983d7e clean code 2023-02-06 22:21:54 +01:00
Frédéric FRANCE
a224d7c824 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-06 20:57:49 +01:00
Laurent Destailleur
fe35f5ec28 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 14:21:25 +01:00