bomuux
b03d7c60ff
Bug: Cannot set thirdparty customer accountancy code to empty string
...
When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation :
code_compta to code_compta_client
2022-04-04 18:06:11 +02:00
Atm-Gregr
53b185ce9c
fix condition on remx
2022-04-04 10:19:51 +02:00
Laurent Destailleur
5b91ae062f
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
...
code consistency purpose.
2022-04-02 10:31:58 +02:00
Laurent Destailleur
a51c868a8e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
106e3072dc
Update card.php
2022-04-01 13:20:40 +02:00
Laurent Destailleur
a3dbcd0c27
Clean language files
2022-04-01 13:09:11 +02:00
Florian HENRY
e7db103b57
fix: on update with action reminder in future there is user key error
2022-03-31 18:55:54 +02:00
Laurent Destailleur
7b84b3e92d
css
2022-03-31 13:27:14 +02:00
ATM john
c1d9ea95dc
fix function name
2022-03-30 12:16:17 +02:00
Laurent Destailleur
95dc25587c
Standardize code of the fetch_lines()
2022-03-28 13:50:47 +02:00
Laurent Destailleur
78ee498151
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-26 16:13:54 +01:00
Marc de Lima Lucio
cbba7d7d5f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2022-03-25 16:14:53 +01:00
Laurent Destailleur
488b35d096
Merge pull request #20232 from hregis/fix_missing_advanced_perms
...
FIX missing advanced perms
2022-03-24 20:32:58 +01:00
Laurent Destailleur
6438a99960
Fix php syntax
2022-03-24 11:48:51 +01:00
Laurent Destailleur
6abeb2804e
Fix phpcs
2022-03-24 11:47:12 +01:00
Laurent Destailleur
4a80f35aaa
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/product/price.php
htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/langs/en_US/propal.lang
htdocs/product/price.php
htdocs/projet/card.php
htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices
...
NEW option update prices on proposal cloning
2022-03-23 16:49:12 +01:00
Laurent Destailleur
a06fc4691b
Merge pull request #20394 from hregis/new_add_hook_in_commercialindex
...
NEW add hooks in commercial index
2022-03-23 16:05:12 +01:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name
...
FIX uniformize with element name "contact"
2022-03-23 16:04:53 +01:00
Laurent Destailleur
a5e9970866
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2022-03-22 16:58:57 +01:00
Marc de Lima Lucio
3aae8cc3bb
FIX: propal list: bad error management for set not ssigned mass action
2022-03-22 10:54:04 +01:00
Marc de Lima Lucio
d4f55ae116
FIX: propal list: bad error management in mass actions
2022-03-22 10:11:10 +01:00
Laurent Destailleur
6c0e333c7d
Fix we must user relative timezone of date.
2022-03-20 16:33:35 +01:00
Laurent Destailleur
8603d493ad
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Regis Houssin
b70d3eb8eb
FIX uniformize with element name "contact"
2022-03-18 12:05:59 +01:00
Regis Houssin
56280f340f
NEW add hooks in commercial index
2022-03-18 11:55:45 +01:00
Laurent Destailleur
167df9593b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/products.lang
htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
lvessiller
a4508e656c
NEW pull develop
2022-03-17 12:20:15 +01:00
Laurent Destailleur
62f6686ad0
Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line
...
[FIX] errors propagation and trigger position on delete proposal line
2022-03-17 02:35:30 +01:00
Laurent Destailleur
143660799b
Clean code using dolGetFirstLineOfText()
2022-03-16 21:22:03 +01:00
Florian HENRY
a028e795f7
add missing colspan
2022-03-16 13:54:21 +01:00
BB2A Anthony Berton
a1ac38ae03
entity
2022-03-12 21:03:11 +01:00
BB2A Anthony Berton
368a247f95
New method
2022-03-12 18:53:27 +01:00
BB2A Anthony Berton
4f4c95344e
Other
2022-03-12 16:36:32 +01:00
BB2A Anthony Berton
db799d7913
comm card propal preview
2022-03-12 16:00:22 +01:00
BB2A Anthony Berton
f3f1c9ba78
comm card order
2022-03-12 15:54:25 +01:00
Regis Houssin
c9cc067075
FIX missing parenthesis
2022-03-11 10:48:51 +01:00
Regis Houssin
e59befa76b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms
2022-03-11 10:46:14 +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
kamel
1f00dff4da
Correction Stickler CI / stickler-ci
2022-03-09 11:40:26 +01:00
kamel
e06c386507
Fix errors propagation and trigger position on delete proposal line
2022-03-09 11:32:07 +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
lvessiller
2561fcbb85
FIX translate update prices and add const in proposal setup
2022-03-08 10:06:57 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo
...
Fix: typo in template name
2022-03-07 14:55:02 +01:00
Laurent Destailleur
2142440b6c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7
FIX list of visible type of event was not correctly filtered
...
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Florian HENRY
801402f46a
fix : #20267
2022-03-04 11:58:52 +01:00
lvessiller
6c172d6441
NEW option update prices on proposal cloning
2022-03-03 11:58:29 +01:00
John Livingston
1ece554c92
Fix: typo in template name
...
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
bd288f980d
FIX On large proposal or invoice, fix n(n+1) sql into a n sql.
2022-03-01 14:52:47 +01:00
Regis Houssin
e5fd11c8e0
FIX missing advanced perms
2022-03-01 09:28:38 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-27 08:40:01 +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
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-22 21:49:17 +01:00
Laurent Destailleur
3697cb9ca4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
...
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +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
lvessiller
7e17167faf
NEW total mark rate in list
2022-02-16 11:45:29 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-15 19:11:24 +01:00
Frédéric FRANCE
c8640f329e
add missing global
2022-02-15 18:31:05 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global
2022-02-15 18:14:44 +01:00
Frédéric FRANCE
a6a1e3886a
Update propal.class.php
2022-02-15 11:03:50 +01:00
Frédéric FRANCE
b2815c4973
add hook in propal tooltip
2022-02-15 10:53:33 +01:00
Christophe Battarel
288c58e533
fix parent line on propal
2022-02-15 10:41:21 +01:00
Laurent Destailleur
271e9da425
Add option MAIN_STORE_FULL_EVENT_IN_GMT to fix TZ pb with full day event
2022-02-11 15:15:50 +01:00
Laurent Destailleur
b84fd3ec3d
Clean code
2022-02-11 12:46:45 +01:00
Laurent Destailleur
27df3cc02c
FIX events on several days may missing the last day in calendar view.
...
FIX the drag and drop was not available on some events
2022-02-11 11:27:50 +01:00
Laurent Destailleur
30d7f807e4
Fix url
2022-02-10 21:03:10 +01:00
lvessiller
241a65e2ae
NEW add margin info in proposal and order list
2022-02-03 10:39:03 +01:00
Laurent Destailleur
44bc197d03
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 13:25:45 +01:00
Laurent Destailleur
d167e022eb
Debug v15
2022-01-31 12:08:51 +01:00
Laurent Destailleur
2fea78c90a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
Laurent Destailleur
d75dd51bb7
Clean code to debug fulldayevent
2022-01-29 00:39:20 +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
eb336c81a1
Merge pull request #19926 from aspangaro/16a9
...
NEW API Proposals - Add POST lines
2022-01-26 12:06:33 +01:00
Alexandre SPANGARO
31787a99f0
NEW Proposal - Add filter on proposal get lines
2022-01-26 08:50:57 +01:00
stickler-ci
71876755d2
Fixing style errors.
2022-01-26 06:35:26 +00:00
Alexandre SPANGARO
68ba60896f
Copyright
2022-01-26 07:31:17 +01:00
Alexandre SPANGARO
30fd55addc
NEW API Proposals - Add POST lines
2022-01-26 07:29:37 +01:00
Laurent Destailleur
d06f570c23
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 16:50:11 +01:00
Laurent Destailleur
60b90056c4
Fix #yogosha8450
2022-01-19 15:20:10 +01:00
Laurent Destailleur
1087ddb22f
Clean code
2022-01-18 14:00:38 +01:00
Laurent Destailleur
ebc3ef2f37
Removed no more used property
2022-01-18 13:52:09 +01:00
Laurent Destailleur
fb6e5f03f9
Clean code and translation
2022-01-18 13:44:52 +01:00
Laurent Destailleur
e19994c756
Fix drag event on week view
2022-01-18 00:07:45 +01:00
Laurent Destailleur
254ed31fb1
Fix combo
2022-01-17 23:47:23 +01:00
Laurent Destailleur
70e4705149
Clean code
2022-01-17 22:52:56 +01:00
Laurent Destailleur
0e44bfd4e4
Fix remove $_GET
2022-01-17 18:53:57 +01:00
Laurent Destailleur
9d067d74ab
Fix responsive
2022-01-17 17:51:03 +01:00
Laurent Destailleur
6826b373fd
css
2022-01-16 13:22:21 +01:00
Laurent Destailleur
f51554fd4d
Fix missing token
2022-01-13 20:40:42 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray
...
add thirdparty customer code to substitutionarray
2022-01-11 13:31:32 +01:00
Laurent Destailleur
54cf91eda4
Update card.php
2022-01-11 13:31:16 +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
60b2479389
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/core/class/utils.class.php
htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
37daf7764d
Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning
...
FIX : late warning calculation on action comm list
2022-01-06 12:55:37 +01:00
stickler-ci
ec11be2480
Fixing style errors.
2022-01-06 10:31:50 +00:00
atm-lena
97d9b4571a
FIX : late warning calculation on action comm list
2022-01-06 11:21:46 +01:00
Laurent Destailleur
ef56631c80
FIX #yogosha8186
2022-01-03 18:15:19 +01:00
Laurent Destailleur
a49af456ce
Debug page customreports.php
2022-01-03 04:47:17 +01:00
Laurent Destailleur
3774eae510
Responsive
2022-01-02 15:08:46 +01:00
Laurent Destailleur
bdb03c8bd0
Fix responsive
2022-01-02 13:51:30 +01:00
Laurent Destailleur
a7d4aa9fb3
Responsive
2022-01-02 12:49:15 +01:00
Laurent Destailleur
7edba34107
Debug and secure the signature feature
2021-12-25 17:08:40 +01:00
Laurent Destailleur
0387b9922e
FIX error message on sqlfilter in API
2021-12-20 20:49:32 +01:00
Laurent Destailleur
19efa37e4b
Fix default value #19562
2021-12-19 20:55:24 +01:00
Laurent Destailleur
e2e2e69379
Fix bad link
2021-12-19 03:54:04 +01:00
Laurent Destailleur
4cd512738f
Merge pull request #19543 from mbinformatique68/develop
...
FIX Get societe terms of payment if getpost terms of payment is 0 on creating propal
2021-12-16 18:19:29 +01:00
Laurent Destailleur
84400cf1d3
Fix backto page
2021-12-16 13:35:17 +01:00
Laurent Destailleur
bb1d5daa82
css
2021-12-12 23:47:40 +01:00
Laurent Destailleur
2bc417fcf7
FIX parameter $action replaced with $mode. $action reserved for action
2021-12-11 13:22:43 +01:00
Laurent Destailleur
b2611e4cdb
CSS
2021-12-10 13:56:51 +01:00
Laurent Destailleur
d80f83caf4
Clean code
2021-12-09 17:19:31 +01:00
Laurent Destailleur
69cd7ae2ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
d4501a6f67
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-12-08 18:21:56 +01:00
Laurent Destailleur
c3bfd5caa4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/asset/type.php
htdocs/categories/edit.php
htdocs/comm/action/card.php
htdocs/compta/bank/card.php
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/class/extrafields.class.php
htdocs/don/card.php
htdocs/product/stock/card.php
htdocs/projet/card.php
htdocs/projet/tasks/task.php
htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
6886cca1fa
CSS
2021-12-07 02:35:46 +01:00
Quentin VIAL-GOUTEYRON
826bde0656
FIX set optional from post
2021-12-06 11:19:12 +01:00
mbinformatique68
1e845434e0
Get societe terms of payment if getpost terms of payment is 0
2021-12-03 09:42:50 +01:00
atm-greg
db06de0ac2
add printFieldListHaving hook
2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +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
31393802ff
Update card.php
2021-11-30 15:29:19 +01:00
Laurent Destailleur
efe4b2363a
Merge pull request #19514 from atm-greg/FIX_Uniformize_printFieldListFrom_hook
...
uniformize hooks behaviour
2021-11-30 11:20:22 +01:00
atm-greg
71d4b3f082
add hook // Add from hooks
2021-11-29 17:02:57 +01:00
atm-greg
1dffc1c0fa
add hook to uniformize printFieldListFrom hook
2021-11-29 16:54:26 +01:00
Christian Foellmann
6608f5f0d8
update all script tags to be uniform. language="javascript" removed
...
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Frédéric FRANCE
661e404a14
fix tests
2021-11-24 22:56:32 +01:00
Frédéric FRANCE
ebc54f82e6
move actioncomm
2021-11-24 18:16:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental
2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc
FIX : use $linecount = count($this->lines);
2021-11-23 10:44:43 +01:00
Gauthier PC portable 024
e02405edc9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:23:26 +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
Laurent Destailleur
441af6b6fb
Fix add rel="noopener noreferrer"
2021-11-22 02:35:55 +01:00
Laurent Destailleur
48d7378282
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00