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 |
|
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
|
120fb10738
|
Update code
|
2022-09-03 11:09:59 +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 |
|
Sylvain Legrand
|
a1bae3453a
|
Add an option to manage input size for customer / supplier references
|
2022-09-01 08:34:22 +02:00 |
|
Frédéric France
|
8e66b7207e
|
replace ! empty by !empty
|
2022-08-31 22:14:20 +02:00 |
|
Frédéric France
|
e71692e745
|
fix php8 warnings
|
2022-08-31 22:02:31 +02:00 |
|
Frédéric France
|
fc01cc66cd
|
fix php8 warnings
|
2022-08-31 21:55:55 +02:00 |
|
Philippe GRAND
|
f26b1cccdc
|
update code
|
2022-08-31 21:55:54 +02:00 |
|
stickler-ci
|
2ee2dfeea2
|
Fixing style errors.
|
2022-08-27 10:26:09 +00:00 |
|
UT from dolibit
|
765b8053cf
|
Update card.php
|
2022-08-27 12:21:01 +02:00 |
|
Laurent Destailleur
|
bfb01ae928
|
Clean code
|
2022-08-26 18:24:42 +02:00 |
|
Laurent Destailleur
|
af69270a0e
|
NEW Can enter the unit price including the vat
|
2022-08-26 17:39:41 +02:00 |
|
Frédéric France
|
e78f9a56be
|
use isModEnabled
|
2022-08-23 20:16:28 +02:00 |
|
Frédéric France
|
86a7a7c8bb
|
use isModEnabled
|
2022-08-23 20:05:09 +02:00 |
|
Frédéric France
|
4bef0f5745
|
use isModEnabled
|
2022-08-23 20:01:34 +02:00 |
|
Laurent Destailleur
|
72c010622b
|
FIX empty with hasRight and add phpunit to avoid this in future
|
2022-08-14 16:38:20 +02:00 |
|
Laurent Destailleur
|
24b1085639
|
Clean code. Prepare for inputing prices with taxes
|
2022-08-13 19:30:26 +02:00 |
|
Laurent Destailleur
|
95b1b3f990
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/emailcollector/class/emailcollector.class.php
htdocs/index.php
htdocs/website/index.php
|
2022-08-10 13:16:02 +02:00 |
|
Regis Houssin
|
b20144c3d0
|
FIX php8 compatibility
|
2022-08-08 11:39:43 +02:00 |
|
Laurent Destailleur
|
654e7bf638
|
Merge branch 'develop' into FIX---php-V8-user-right-order-card
|
2022-07-28 14:21:20 +02:00 |
|
Anthony Berton
|
a778a5ff78
|
and order lib
|
2022-07-28 11:50:42 +02:00 |
|
Anthony Berton
|
03e265b080
|
FIX - php V8 user right order card
|
2022-07-28 11:43:00 +02:00 |
|
Anthony Berton
|
d8ae2361a9
|
NEW - Add user right order generete doc
|
2022-07-28 11:29:36 +02:00 |
|
Laurent Destailleur
|
fb96145b49
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-07-12 02:05:20 +02:00 |
|
Laurent Destailleur
|
204bf2e618
|
Update card.php
|
2022-07-11 10:54:23 +02:00 |
|
This Charlène
|
796f718012
|
Update card.php
|
2022-07-11 07:14:46 +02:00 |
|
This Charlène
|
8be15e8e27
|
php v8 fix warning
missing and bad name variables
|
2022-07-11 07:11:45 +02:00 |
|
Christian Foellmann
|
4c5e05e411
|
fix page titles
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/contact/list.php
htdocs/product/stock/movement_list.php
htdocs/user/list.php
|
2022-07-06 19:19:08 +02:00 |
|
Laurent Destailleur
|
76e3c10c06
|
Revert "fix page titles"
|
2022-07-06 15:56:04 +02:00 |
|
Christian Foellmann
|
89d1389e2d
|
fix page titles
|
2022-06-27 12:48:04 +02:00 |
|
Laurent Destailleur
|
bc81f372ac
|
Merge pull request #21362 from bb2a/FIX---Cancel-order
FIX - Right close order
|
2022-06-27 11:46:55 +02:00 |
|
Laurent Destailleur
|
a1f974f356
|
Merge pull request #21374 from aspangaro/17p2
Look & Feel v16 - Align amount to right on card
|
2022-06-27 11:39:31 +02:00 |
|
Alexandre SPANGARO
|
11a1273211
|
PHP8 warning & typo on key
|
2022-06-25 07:13:15 +02:00 |
|
Alexandre SPANGARO
|
cadf8ebe29
|
Look & Feel v16 - Align amount to right on card
|
2022-06-25 06:55:10 +02:00 |
|
BB2A Anthony Berton
|
0d00c4b26d
|
FIX
|
2022-06-23 15:34:45 +02:00 |
|
Laurent Destailleur
|
2370ff4dfc
|
Clean code
|
2022-06-14 21:00:05 +02:00 |
|
Laurent Destailleur
|
dd392143e1
|
Fix conf->projet conf->project
|
2022-06-14 17:53:17 +02:00 |
|
Frédéric France
|
3fdbce7a31
|
use isModEnabled function
|
2022-06-11 09:46:28 +02:00 |
|
Frédéric France
|
5dcfc28913
|
use isModEnabled function
|
2022-06-09 22:41:59 +02:00 |
|
BENKE Charlene
|
2ad50b77b7
|
php V8 warning
|
2022-05-27 16:34:56 +02:00 |
|
Laurent Destailleur
|
259a292704
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-05-24 16:33:24 +02:00 |
|
Laurent Destailleur
|
34199cf0fb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/comm/propal/card.php
htdocs/core/modules/modRecruitment.class.php
|
2022-05-24 16:31:45 +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 |
|
Eric Seigne
|
4a222fe5d5
|
fix potential warning ($conf->ficheinter->enabled)
|
2022-05-22 01:38:32 +02:00 |
|
Frédéric FRANCE
|
243dfacb15
|
Update card.php
|
2022-05-19 12:46:15 +02:00 |
|
Frédéric FRANCE
|
ad3276b579
|
Update card.php
|
2022-05-19 12:42:15 +02:00 |
|
Frédéric FRANCE
|
2114e51b0e
|
Update card.php
|
2022-05-19 12:34:54 +02:00 |
|
Frédéric FRANCE
|
e44e9d812a
|
Update card.php
|
2022-05-19 12:28:50 +02:00 |
|
Laurent Destailleur
|
2e15a14c14
|
css
|
2022-05-18 00:10:44 +02:00 |
|
Laurent Destailleur
|
720a09dacb
|
Fix regression
|
2022-05-09 15:57:10 +02:00 |
|
Laurent Destailleur
|
522c092aeb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-05-09 09:26:10 +02:00 |
|
Laurent Destailleur
|
b3b6337c4c
|
Merge branch 'develop' into NEW_deposit_payment_terms
|
2022-05-08 23:09:06 +02:00 |
|
Laurent Destailleur
|
a99e647348
|
Merge pull request #20658 from Hystepik/develop#1
NEW #20653 edit discount pourcentage for all lines in one shot
|
2022-05-04 01:20:49 +02:00 |
|
Laurent Destailleur
|
708d3610a5
|
Look and feel v16
|
2022-04-29 13:04:29 +02:00 |
|
lmarcouiller
|
1ccf209c47
|
Close #20653 : edit discount pourcentage
|
2022-04-15 14:31:44 +02:00 |
|
BB2A Anthony Berton
|
d154696c32
|
morecss select_compagny
|
2022-04-13 16:15:07 +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
|
4693ef42bd
|
Enhance responsive
|
2022-04-07 11:18:56 +02:00 |
|
GregM
|
4fb62ee15a
|
replacing to dolGetButtonAction on Commande card
|
2022-03-22 12:04:51 +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
|
54ecf1f98c
|
# WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-03-07 15:24:08 +01:00 |
|
Frédéric FRANCE
|
9d1bcbe55a
|
Fix wrong upload dir
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
|
2022-03-04 18:17:23 +01:00 |
|
Laurent Destailleur
|
409da7f091
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-02-25 19:17:41 +01:00 |
|
Laurent Destailleur
|
f8a5749fc4
|
# WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-02-25 19:00:10 +01:00 |
|
Laurent Destailleur
|
73b04deb19
|
Fix error management.
|
2022-02-23 00:17:49 +01:00 |
|
Laurent Destailleur
|
e96061dd18
|
Fix phpunit SecurityTest
|
2022-02-22 23:46:57 +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 |
|
Christophe Battarel
|
6c6c854eae
|
fix parent line on create with origin
|
2022-02-15 10:23:43 +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 |
|
Laurent Destailleur
|
91b2d59458
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-01-14 10:37:41 +01:00 |
|
Laurent Destailleur
|
53e65095a7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/commande/card.php
htdocs/expedition/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
|
2022-01-14 10:36:46 +01:00 |
|
Laurent Destailleur
|
9dde80dd52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/expedition/card.php
htdocs/fourn/commande/list.php
|
2022-01-14 10:30:39 +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
|
4189229b84
|
Merge pull request #19165 from Hystepik/develop#5
Fix: php 8.0 warning commercial part
|
2021-11-30 15:31:51 +01:00 |
|
Laurent Destailleur
|
ee14aa2597
|
Fix: Do not loose data on error when editing a line
|
2021-11-23 12:11:27 +01:00 |
|
Gauthier PC portable 024
|
9840c1e0fa
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-22 16:17:55 +01:00 |
|
Gauthier PC portable 024
|
e75b6ae0b4
|
FIX : it's better with an input number
|
2021-11-22 16:13:46 +01:00 |
|
lmarcouiller
|
d1f5cb9184
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5
|
2021-11-19 14:01:52 +01:00 |
|
lmarcouiller
|
3bcafb548a
|
fix errors
|
2021-11-19 14:01:37 +01:00 |
|
Gauthier PC portable 024
|
23249751d5
|
FIX : reorder all lines when delete document line everywhere
|
2021-11-17 12:10:12 +01:00 |
|
Gauthier PC portable 024
|
375dcf7028
|
FIX : dev name
|
2021-11-16 16:42:48 +01: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 |
|
Laurent Destailleur
|
fe7e1d4118
|
Look and feel v15
|
2021-10-29 09:40:38 +02:00 |
|
Marc de Lima Lucio
|
5057ba29b2
|
FIX: deposit payment terms: removed bad copy/paste
|
2021-10-28 16:53:53 +02: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
|
03c24b2274
|
FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue()
|
2021-10-28 16:51:59 +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
|
051f6ca717
|
Fix: php 8.0 warning commercial part
|
2021-10-23 23:12:42 +02:00 |
|
Laurent Destailleur
|
8604f9b153
|
Clean DOM (remove ficheaddleft div)
|
2021-10-23 17:18:35 +02:00 |
|
Laurent Destailleur
|
3f60cbbedc
|
Remove the div class="ficheaddleft"
|
2021-10-23 14:49:35 +02:00 |
|
Laurent Destailleur
|
6c870bb3d1
|
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
fix: scrutinizer
|
2021-10-21 22:52:20 +02:00 |
|
Florian HENRY
|
258d0c3a69
|
fix: scrutinizer
|
2021-10-21 16:05:37 +02:00 |
|
Laurent Destailleur
|
12d211815b
|
Debug v15
|
2021-10-19 21:38:36 +02:00 |
|
Laurent Destailleur
|
f8010dfcbc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
|
2021-10-16 13:01:03 +02:00 |
|
Marc de Lima Lucio
|
9a963da77c
|
FIX: deposit payment terms: adapt Form::form_conditions_reglement() calls to new parameter added in between PRs
|
2021-10-13 11:39:09 +02:00 |
|
lvessiller
|
be4a00213c
|
FIX optional visibility on create card
|
2021-10-08 15:58:08 +02:00 |
|
Marc de Lima Lucio
|
9d92260ec1
|
FIX: deposit payment terms: fatal error for lack of inclusion on class Facture
|
2021-10-05 14:57:14 +02:00 |
|