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
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc
FIX check tva_tx before comparing price_min_ttc (#25220) 
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
 2023-10-16 04:07:10 +02:00
Laurent Destailleur
bf7a8725a5 Debug v19 2023-10-15 22:08:09 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Anthony Berton
70d8ced6fa
FIX - Clean in list det order (#26201) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-12 18:42:15 +02:00
Laurent Destailleur
f1330e5998 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 15:01:26 +02:00
Laurent Destailleur
6311200b36 FIX #26170 2023-10-12 14:31:54 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Anthony Berton
cbe981b3be
FIX - Sub-total on last line to list det order (#26178) 
* FIX - Sub-total on last line to list det order

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-11 01:55:20 +02:00
Anthony Berton
8d3f4f9bd3
FIX - getDolGlobalInt('MAIN_CHECKBOX_LEFT_COLUMN') for list det order (#26176) 
* FIX - getDolGlobalInt('MAIN_CHECKBOX_LEFT_COLUMN') for list det order

* FIX $totalarray['nbfield']

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-10 21:16:21 +02:00
Anthony Berton
79b02494cf
FIX - getDolGlobalInt for left colum (#26169) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-10 18:39:14 +02:00
Anthony Berton
36d1b73101
FIX - Search label or description on list det order (#26160) 
* FIX - Search label or description on list det order

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-10 09:10:31 +02:00
Anthony Berton
a8a283c34f
NEW - Add culum Technical ID in liste det order (#26164) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-10 09:07:44 +02:00
Anthony Berton
c9b4aca8c6
NEW - Sub total in list (#26165) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-10 09:07:25 +02:00
Dev2a
b76c402a09 Fix: Change access to $conf->global to function getDolGlobal (manual) 2023-10-08 23:25:46 +02:00
Laurent Destailleur
68404bec9b
Merge pull request #22619 from mbinformatique68/develop 
NEW Add the formEditObjectLine hook on commande card and invoice card
 2023-10-06 19:13:58 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Pascal Hubrecht
9835385f58
Merge branch 'Dolibarr:develop' into rest-extra 2023-09-25 20:59:57 +02:00
Laurent Destailleur
11a1630287 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-25 11:47:18 +02:00
Laurent Destailleur
55b91f00d2 Look and feel v19 2023-09-25 11:44:46 +02:00
Regis Houssin
d133075fca FIX #25982 and avoid lose selected value if error 2023-09-24 15:56:18 +02:00
Laurent Destailleur
cd69bd6cba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-21 19:23:24 +02:00
Laurent Destailleur
f6eb0e6629
Merge pull request #25832 from ATM-Consulting/FIX_16.0_commande_box_sql 
fix sql query for external users
 2023-09-20 09:56:21 +02:00
Laurent Destailleur
9148d7540e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-09-20 03:09:10 +02:00
Laurent Destailleur
e8edd115f1 Fix status 2023-09-19 21:16:32 +02:00
Laurent Destailleur
498af7d7bc Look and feel v19 2023-09-19 21:05:02 +02:00
Laurent Destailleur
492b726da9 Fix regression with label of order 2023-09-19 20:32:23 +02:00
Laurent Destailleur
69e7f0f1f3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-19 20:07:36 +02:00
Laurent Destailleur
8f002a2310 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-19 18:14:27 +02:00
Laurent Destailleur
336927ad70 Fix link to create puchase order from sale order 2023-09-19 18:10:47 +02:00
Laurent Destailleur
101ddf2a75 FIX link to create purchase order from sale order 2023-09-19 18:05:57 +02:00
Laurent Destailleur
39dd702145 Fix warning in option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER 2023-09-19 17:59:46 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
d91ce60ab4
Merge pull request #25819 from frederic34/setascustomer 
deprecate set_as_client
 2023-09-08 11:23:06 +02:00
atm-greg
aa34f800c2 user inner join 2023-09-08 11:18:59 +02:00
atm-greg
b8455430af fix sql query for external users 2023-09-07 16:47:57 +02:00
Frédéric FRANCE
26dff90658 deprecate set_as_client 2023-09-06 14:38:35 +02:00
Regis Houssin
b6e84b1c74 FIX use urlencode for origin and originid 2023-09-06 10:02:12 +02:00
Regis Houssin
927cc91da4 FIX avoid wrong backtopage url 2023-09-06 06:44:10 +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
272c51164b Fix typo Productcustomerprice into ProductCustomerPrice 2023-08-24 15:08:33 +02:00
Laurent Destailleur
bf1549e6e0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 00:14:55 +02:00
Laurent Destailleur
888e8d7588 FIX bad balance of TR tag in multicurrency price view 2023-08-23 21:56:02 +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
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