Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

4429 Commits

Author SHA1 Message Date
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
 2023-11-12 23:18:19 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
atm-lena
0946220e9b Check price base type (#26503) 
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
 2023-11-09 15:41:39 +01:00
Benjamin Falière
b5e5b1d4c6 FIX commande context (#26497) 
Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
 2023-11-07 17:50:48 +01:00
Mohamed DAOUD
a1597e6eb1 Fix some warnings -technical debt- (#26466) 
* fix warnings 1

* fix previous commit 1

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-06 16:00:24 +01:00
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
thibdrev
51341524a2 fix missing 2 translation keys used in commande/list.php (#26458) 
* modify the translation keys in commande/list.php

* create the error translation key in en_US/errors.lang

* create the error translation key in fr_FR/errors.lang
 2023-11-03 22:51:51 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
Christophe Battarel
b3e7457cd3 NEW : add new hook tabContentCreateOrder (#26408) 
* NEW : add new hook tabContentCreateOrder

* update comment

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:25:26 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Christophe Battarel
1a32455e70 update comment and credentials (#26401) 
* update comment

* update credentials

* remove bad commit

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-31 11:57:53 +01:00
Laurent Destailleur
b8728b5d07 Use a more explicit name for new hook 2023-10-30 02:39:06 +01:00
Christophe Battarel
c064893f80 NEW : add new hook OrderCard (#26380) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-30 02:30:35 +01:00
Anthony Berton
dc8d6f9ca2 FIX - Search product category on list det order (#26168) 
* FIX - Search product category on list det order

* Search for tag/category

* add search Operator

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-26 13:57:40 +02:00
Laurent Destailleur
a318031034 QUAL Standardize code. Renamed ID of user properties into ->user_xxx_id 2023-10-24 11:37:29 +02:00
Anthony Berton
2c01a59e60 FIX - param in order list det (#26298) 
* FIX - param in order list det

* Clean

* $newcardbutton

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-23 21:48:43 +02:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
Alexandre SPANGARO
58bdcb5245 Dolibarize - Look & feel v19 (#26246) 
* NEW Accountancy - Add quick navigation with keyb. shortcut on ledger

* TitleSeparator - Job list

* TitleSeparator - Position list

* TitleSeparator

* TitleSeparator

* TitleSeparator

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Variable $newcardbutton already define

* Define $newcardbutton

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator
 2023-10-20 03:20:44 +02:00
Lucas Marcouiller
42865a975a Fix some code smell (#26277) 
* Fix some code smell

* Update commande.class.php

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-20 02:20:26 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +02:00
Laurent Destailleur
b37a438067 The property ->user_validation to store ID of user validating has been 
renamed into ->user_validation_id.
 2023-10-17 11:10:25 +02:00
Laurent Destailleur
f18529f944 Clean code 2023-10-17 10:52:19 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed 
into ->delivery_date has been completely removed.
 2023-10-17 10:36:11 +02:00
Anthony Berton
5639352df7 NEW - Right for stats orders (#24607) 
* NEW - Right for stats orders

* NEW: use account address in sepa mandate (#23642)

* New: allow to display account address in pdf sepa mandate. Fix: use ->proprio because ->account_owner does not exist.

* Stickler fix

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: thomas-Ngr <tnegre@open-dsi.fr>
 2023-10-16 17:19:07 +02:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
48adfe9bcd Fix regression 2023-10-16 05:59:34 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
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