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

971 Commits

Author SHA1 Message Date
Christophe Battarel
f6741591c7 add constant ORDER_DONT_REOPEN_BILLED 2024-01-02 09:10:28 +01:00
Laurent Destailleur
70ce043b58
Merge pull request #27165 from defrance/patch-310 
Php V8 warning
 2023-12-28 19:28:43 +01:00
Laurent Destailleur
47a633cf2e
Update card.php 2023-12-28 19:28:28 +01:00
Laurent Destailleur
d6e4b71958
Merge pull request #27104 from cfoellmann/19/PR/stings-supplier 
make UI strings differenciate between orders torward customer or supplier
 2023-12-19 16:08:48 +01:00
Charlène Benke
b881dca994
php V8 warning 2023-12-18 16:53:12 +01:00
MDW
e49f32ab2d dolGetGlobalInt -> getDolGlobalInt 
Detected with phan -> https://github.com/Dolibarr/dolibarr/actions/runs/7242660297/job/19728384233?pr=26480#step:5:39
 2023-12-18 03:13:37 +01:00
ATM john
2caf7e6c0b Add llxHeader body css for command 2023-12-16 13:46:47 +01:00
Christophe Battarel
273fbbc65c dont reopen billed orders 2023-12-14 15:54:09 +01:00
Christophe Battarel
30d181c933 aadd constant ORDER_REOPEN_TO_DRAFT 2023-12-14 15:35:37 +01:00
Christian Foellmann
88c0700ee5 QUAL make UI strings differenciate between orders torward customer or supplier 2023-12-14 13:42:15 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Alexandre SPANGARO
af0c6899a7
Travis fix (#26708) 
* Travis fix

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"
 2023-11-18 11:56:29 +01:00
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
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
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +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
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
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
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +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
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
9148d7540e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-09-20 03:09:10 +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
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +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
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
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
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
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
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
Laurent Destailleur
ebdd397d7c
Merge pull request #24779 from FliyFly/editcommandeattribute 
New attributes on commande card
 2023-05-16 19:42:24 +02: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
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
Francis Appels
cec58e5631 Add missing error message on modify order error. 2023-04-28 10:48:50 +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
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
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
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
b97b85fa8c Look and feel v18 2023-03-14 12:05:25 +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
24f77465cc use a fonction to get multidir output 2023-03-08 21:16:37 +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
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
Laurent Destailleur
fe35f5ec28 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 14:21:25 +01:00
Philippe GRAND
d903008786 fix : Warning: Undefined variable in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/commande/card.php on line 688 2023-02-05 15:14:23 +01:00
Laurent Destailleur
2690dd6274
Merge pull request #23730 from altairis-benjamin/commandcard 
FIX Get data back when error on command create
 2023-02-04 17:06:32 +01:00
Benjamin Falière
9f85e4a60f Fixed another little error 2023-01-30 14:21:10 +01:00
Benjamin Falière
e7c6eac984 Replaced GETPOST with GETPOSTISSET 2023-01-30 14:06:49 +01:00
stickler-ci
f2c877f66a Fixing style errors. 2023-01-30 11:06:30 +00:00
Benjamin Falière
79f401f5fb Get data back when error on command create 2023-01-30 11:50:23 +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
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
3769861a8a NEW VAT can be modified during add of line 2023-01-10 21:46:11 +01:00
Laurent Destailleur
ac5a07fee8 Debug v17 2023-01-10 17:27:19 +01:00
Laurent Destailleur
5280d070e3 Fix technical debt 2023-01-06 19:24:57 +01:00
Laurent Destailleur
67144020c6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-02 20:24:13 +01:00
stickler-ci
59ed7b9f96 Fixing style errors. 2023-01-02 11:52:34 +00:00
Amael
658753d242
Merge branch '17.0' into Amael-PE-FIX-23334 2023-01-02 12:47:45 +01:00
Christian Humpel
2aef5e94df Set $remise_percent to 0, if GETPOST is empty. 2023-01-02 00:17:06 +01:00
Christian Humpel
da4567c875 Set $remise_percent to 0, if GETPOST is empty. 2023-01-01 15:05:04 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
3ca8e8c493 Fix warning 2022-12-31 13:47:09 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
stickler-ci
50e2545bea Fixing style errors. 2022-12-25 23:41:03 +00:00
Amael
07a1f8e651
FIX #23334 Implement a price equivalent in command 
Implement a price equivalent when dealing with minimum prices and foreign currencies.
Added in command/card.php for add and update.
 2022-12-26 00:05:34 +01:00
hystepik
27cb4b4d86 Fix: php 8.1 warnings 2022-12-15 14:46:29 +01:00
MB Informatique
52365b2d87
Merge branch 'Dolibarr:develop' into develop 2022-11-07 14:07:03 +01:00
Laurent Destailleur
81813225aa Look and feel v17 2022-10-24 01:25:50 +02:00
Laurent Destailleur
d9c2528b62 Clean code 2022-10-21 23:49:45 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
mbinformatique68
d30b1b4860 NEW Add the formEditObjectLine hook on commande card 2022-10-18 16:33:30 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
63109d2844
Merge pull request #22182 from frederic34/pr/dolibit-ut/22136 
sample deprecated function
 2022-10-06 12:20:15 +02:00
Laurent Destailleur
07966f5e6b Clean code 2022-10-01 14:00:43 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references 
Add an option to manage input size for customer / supplier references
 2022-09-25 18:48:55 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +02:00
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
Alexandre SPANGARO
fc9e6c541e Use isModEnabled 2022-09-25 06:30:33 +02:00
Alexandre SPANGARO
5eaffd64e7 Use isModEnabled 2022-09-25 06:13:22 +02:00
Alexandre SPANGARO
58ac8d196c Use isModEnabled 2022-09-25 06:01:40 +02:00
priojk
33291b7cc7 FIX #21799 inactive companies cannot be selected 2022-09-24 17:19:52 +02:00
Philippe GRAND
fb9db96ecc update code toward php8 compliance 2022-09-24 14:37:57 +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
f5fe366525 FIX broken feature, wrong fk_parent_line 2022-09-16 15:03:53 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Frédéric France
e96eee56b0 sample deprecated function 2022-09-10 13:55:40 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00