Laurent Destailleur
84db3437bd
Add missing ' in command
2022-02-25 14:13:42 +01:00
Laurent Destailleur
eb6383ff1d
Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta
...
Display Salary Paiement on compta report
2022-02-25 14:02:32 +01:00
Laurent Destailleur
a2dea71b4d
Merge pull request #20172 from Dolibarr/atm-maxime-patch-1
...
Fix #20171 permissiontoadd
2022-02-25 14:00:13 +01:00
Laurent Destailleur
7d6cbe0800
Merge pull request #20173 from thomas-Ngr/develop_new_SEPA_PmtTpInf_CdtTrfTxInf
...
NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
2022-02-25 13:48:32 +01:00
Laurent Destailleur
f4f75e1d0e
Merge pull request #20175 from bloxera/15.0
...
Fix #20141 generation of intervention
2022-02-25 13:44:03 +01:00
Laurent Destailleur
92daeeb5c9
Merge pull request #20179 from atm-gauthier/NEW/solde_until_date
...
NEW : solde() function evolution to be able to get solde until a chosen date
2022-02-25 13:35:33 +01:00
Laurent Destailleur
e5805f401a
Merge pull request #20185 from SylvainLegrand/new_ficheinter_keep_extrafield_format_from_origin
...
keep extrafield format from origine
2022-02-25 13:33:12 +01:00
Laurent Destailleur
a92a21b65b
Merge pull request #20184 from aspangaro/16a3
...
NEW Accountancy - Add date from/to on expense report binding & uniformize
2022-02-25 13:29:16 +01:00
Laurent Destailleur
28d91bfcf4
Merge pull request #20187 from SylvainLegrand/Debug_TCPDF_file_name
...
Debug TCPDF file name with spaces
2022-02-25 13:21:41 +01:00
Sylvain Legrand
cb86224613
new : allow to show all logos on a table
2022-02-25 13:17:05 +01:00
Laurent Destailleur
09f8c63ed3
Merge pull request #20188 from SylvainLegrand/new_allow_show_logos_in_table
...
new : allow to show all logos on a table
2022-02-25 13:12:48 +01:00
Anthony Berton
a9450f5673
Update societe.php
2022-02-25 11:50:41 +01:00
Jé GDSOFT
1040555baf
accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-25 11:26:56 +01:00
GregM
22aae26f71
update product card
2022-02-25 10:27:26 +01:00
GregM
6e938c019f
Merge branch 'DolGetButtonAction_Product' into DolGetButtonAction_Product_card
2022-02-25 10:17:45 +01:00
GregM
a761afe5ed
FIX add dolGetButtonAction on Product
2022-02-25 10:14:39 +01:00
kevin
22fc4317be
Add init hooks on several supplier tabs
2022-02-25 09:37:36 +01:00
Sylvain Legrand
e8ef2a8d8c
new : allow to show all logos on a table
2022-02-25 09:33:08 +01:00
Sylvain Legrand
30d8174ac5
Debug TCPDF file name with spaces
2022-02-25 09:26:19 +01:00
kevin
aabfdfa212
Format code
2022-02-25 09:20:36 +01:00
kevin
d2cbead203
Add an ID into formproject method to be able to target
2022-02-25 09:17:18 +01:00
Sylvain Legrand
61aa80c865
keep extrafield format from origine
2022-02-25 09:13:16 +01:00
Alexandre SPANGARO
6b4c4f19ab
NEW Accountancy - Add date from/to on expense report binding & uniformize
2022-02-25 04:55:55 +01:00
Laurent Destailleur
c097ee5331
FIX #yogosha9089
2022-02-25 01:49:38 +01:00
Laurent Destailleur
8c61a29051
Show value of short_open_tags
2022-02-25 01:30:34 +01:00
Laurent Destailleur
117e1057e1
FIX #yogosha9083
2022-02-24 18:29:24 +01:00
Laurent Destailleur
98da84f9b2
FIX #yogosha9086
2022-02-24 18:15:04 +01:00
Laurent Destailleur
f0c5fe31f8
FIX #yogosha9083
2022-02-24 17:49:52 +01:00
stickler-ci
a0bc41cdba
Fixing style errors.
2022-02-24 14:32:59 +00:00
Gauthier PC portable 024
517562b465
NEW : solde() function evolution to be able to get solde until a chosen date
2022-02-24 15:26:11 +01:00
Thomas Negre
4d2dde0fe4
fix bookmarks info bubble
2022-02-24 14:38:28 +01:00
Laurent Destailleur
ba3856f9e9
Fix regression
2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98
FIX Reduce flash effect on collapse extrafield
...
FIX Reduce flash effect on edit inline feature.
2022-02-24 12:54:33 +01:00
Laurent Destailleur
118b211807
Fix error on null
2022-02-24 12:37:20 +01:00
GregM
c65680dbcf
WIP dolGetButtonAction on Product
2022-02-24 11:48:10 +01:00
priojk
c201ff211f
Fix #20141 generation of intervention
...
When an intervention card was created from the times spent on tasks in a project, the task label was wrong in
the descriptions on the intervention card
2022-02-24 11:10:46 +01:00
stickler-ci
fa4e6bd93a
Fixing style errors.
2022-02-24 10:10:41 +00:00
Adrien Raze
146b432acf
FIX: PR returns
2022-02-24 11:07:31 +01:00
Laurent Destailleur
4973019630
Fix #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd
2022-02-24 09:59:16 +01:00
Thomas Negre
7c29b2421d
only display SEPA XML option at account creation if module payment by bank transfer is enabled
2022-02-24 09:52:41 +01:00
Atm-Gregr
18c81a1355
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0
2022-02-24 09:34:21 +01:00
Thomas Negre
2d74e4fce1
add field pti_in_ctti in bank_account table description. Change column type to smallint.
2022-02-24 09:30:55 +01:00
Maxime Kohlhaas
a9ce98dfb0
Update document.php
2022-02-24 03:11:43 +01:00
Laurent Destailleur
43c3869f08
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-24 01:01:43 +01:00
Laurent Destailleur
c5cd6a5f3c
Fix css
2022-02-24 00:17:49 +01:00
Laurent Destailleur
2f0040e9c1
Fix phpunit
2022-02-23 19:24:17 +01:00
Thomas Negre
83ed380e6b
display XML SEPA config option only if 'payment by bank transfer' module is enabled
2022-02-23 16:36:57 +01:00
Thomas Negre
f2c85786ae
add en_US strings
2022-02-23 16:24:32 +01:00
Thomas Negre
af4e1667e0
Payment by bank transfer: create optionnaly place payment type information (PmtTpInf) in credit transfer transaction information (CdtTrfTxInf)
...
- introduce PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY const
2022-02-23 16:23:25 +01:00
Thomas Negre
7a13112ad8
bank card interface modification to allow configuration of payment type information in SEPA XML
2022-02-23 16:22:37 +01:00
Thomas Negre
6136de6a4a
add 'pti_in_ctti' property for Account object. Update related methods.
2022-02-23 16:22:19 +01:00
Thomas Negre
80d85b4239
db migration: add a column in llx_bank_account to store the expected SEPA format concerning PmtTpInf.
2022-02-23 16:17:18 +01:00
GregM
cf470c2306
Add auto tooltip
2022-02-23 16:01:07 +01:00
Steve
f70e97bafa
fix: travis
2022-02-23 15:45:50 +01:00
GregM
3edd478a46
Fix empty url : dont add token
2022-02-23 15:36:43 +01:00
atm-lena
ed6f4b4ee1
Display Salary Paiement on compta report
2022-02-23 15:33:51 +01:00
Steve
bd6c547b4d
fix: merge develop
2022-02-23 15:20:45 +01:00
Steve
6feda05aeb
Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_replace_divbutaction_by_dolgetbuttonaction
2022-02-23 15:19:37 +01:00
Steve
6047e4e90b
fix: travis + stickler
2022-02-23 15:06:58 +01:00
Steve
b99557e60c
fix: feedback travis
2022-02-23 14:59:39 +01:00
Steve
c7077ef1d7
fix: send mail title
2022-02-23 14:49:12 +01:00
Laurent Destailleur
64ce13e273
Clean setup page
2022-02-23 13:20:14 +01:00
Laurent Destailleur
88f1ae9c13
NEW A module can embed a sql script run at each Dolibarr upgrade
2022-02-23 12:55:15 +01:00
Laurent Destailleur
e119ea0524
css
2022-02-23 12:31:32 +01:00
lmarcouiller
57ed890b73
NEW : dol_uncompress new extensions
2022-02-23 12:28:37 +01:00
Steve
f6985ae546
merge develop
2022-02-23 12:25:44 +01:00
Steve
9a95fc7a00
wip: pull request feedback
2022-02-23 11:13:31 +01:00
Steve
c26b1e58a2
wip: pull request feedback
2022-02-23 11:09:59 +01:00
Steve
26e23219e6
feat: dolGetButtonAction
2022-02-23 10:34:54 +01:00
Alexandre SPANGARO
7f29668c62
Increase the length of the ref_supplier field
2022-02-23 06:43:01 +01:00
Alexandre SPANGARO
0510d84263
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
2022-02-23 06:08:20 +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
77e2969411
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-22 22:27:32 +01:00
Laurent Destailleur
c7c0c75429
Clean code
2022-02-22 22:27:09 +01:00
Laurent Destailleur
e0c24e5d29
Enhance WAF
2022-02-22 22:19:32 +01:00
Laurent Destailleur
27cc6078ed
Clean code
2022-02-22 22:15:29 +01:00
Laurent Destailleur
d6786459b4
FIX #yogosha9054
2022-02-22 22:03:34 +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
209ab708d4
FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd
2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981
Website tables are created only if module enabled.
2022-02-22 19:15:37 +01:00
Laurent Destailleur
fb58b7e930
FIX #yogosha9048
2022-02-22 18:49:16 +01:00
Laurent Destailleur
2d841d5b99
Fix param
2022-02-22 18:48:25 +01:00
Laurent Destailleur
8cc0f3bb58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-02-22 18:47:26 +01:00
Laurent Destailleur
1c0ef23316
FIX #yogosha9048
2022-02-22 18:46:46 +01:00
Laurent Destailleur
8a99bc3b04
Try a more complete sanitization
2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c
FIX: invoice pdf: lines originating from deposits were not detailed anymore
2022-02-22 17:42:11 +01:00
Steve
3fb0d307b1
wip: clean comments
2022-02-22 17:23:34 +01:00
Marc de Lima Lucio
1574254dcf
FIX: viewimage.php: bad call to dol_check_secure_access_document() caused images to be blocked with multicompany from entities > 1
2022-02-22 17:13:26 +01:00
stickler-ci
19dbed1804
Fixing style errors.
2022-02-22 16:10:56 +00:00
lmarcouiller
65ecd2f3ef
Fix : fix error of permission in holiday
2022-02-22 17:06:10 +01:00
Laurent Destailleur
21069dd9a5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-22 16:44:31 +01:00
Laurent Destailleur
f544219d92
FIX permission to download files of expense report with readall.
2022-02-22 16:44:17 +01:00
steve
679665fb08
feat: dolGetButtonAction for Modify
2022-02-22 15:39:02 +01:00
GregM
e107423c21
fix : change title if html not set
2022-02-22 12:25:30 +01:00
steve
ad4a3c63da
feat: dolGetButtonAction for Delete
2022-02-22 12:19:24 +01:00
Laurent Destailleur
aa8932a3a4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-22 10:59:02 +01:00
Laurent Destailleur
6b29b2d9dc
Add preg_quote
2022-02-22 10:51:51 +01:00
steve
fefd4a407b
feat: dolGetButtonAction for Enable and disable user
2022-02-22 09:43:09 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning
...
NEW : optional display warning icons on ticket list
2022-02-22 01:35:33 +01:00
Laurent Destailleur
2c5d88d7a6
Merge pull request #20138 from defrance/patch-178
...
fix : bad redirection after create
2022-02-22 01:17:22 +01:00
Laurent Destailleur
1c5541db1f
Merge pull request #20121 from ptibogxiv/patch-6
...
FIX error with php8
2022-02-22 00:59:26 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields
...
New inventory extrafields
2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17
Fix #yogosha9033
2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62
Fix #yogosha8963
2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55
NEW on redirect of page in website module, GET parameters are kept.
2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa
Work on generic reporting tool.
2022-02-21 19:09:26 +01:00
Laurent Destailleur
97ed94fbda
NEW Support html content for multiselect component.
2022-02-21 16:54:07 +01:00
BENKE Charlene
5647a04369
fix : bad redirection after create
...
we have __ID__ on url redirect, so repplace it with the $id value
2022-02-21 16:50:12 +01:00
BB2A Anthony Berton
d28ba84cb3
Mail sendto default and add filter
2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee
sens dump
2022-02-21 15:56:09 +01:00
atm-lena
dd6d0a118a
Translation
2022-02-21 15:28:38 +01:00
atm-lena
8bbbc843eb
Ajout onglet paramètres "Inventaire extrafields"
2022-02-21 15:20:22 +01:00
atm-lena
2e02b3fcae
Ajout table "llx_inventory_extrafields"
2022-02-21 14:58:47 +01:00
steve
c78ec56c8f
feat: dolGetButtonAction for sendmail
2022-02-21 14:43:00 +01:00
Laurent Destailleur
00e6d2786d
Do not use dol_hash anymore for the name of cookies.
2022-02-21 12:21:43 +01:00
Thomas Negre
d769d856e7
fix $object->status not being set. Avoid using $object->fk_statut.
2022-02-21 12:09:45 +01:00
Thomas Negre
cdbf0bdf6f
add translation strings
2022-02-21 12:09:28 +01:00
Thomas Negre
5d10d6cb78
allow delays configuration from ticket module params
2022-02-21 11:57:59 +01:00
Thomas Negre
ad3f7b531e
add constants declarations in the module class
2022-02-21 11:50:28 +01:00
Thomas Negre
ffbe094635
Add strings for ticket warnings
2022-02-21 11:46:30 +01:00
Thomas Negre
bf9ca1caaa
new : allow to display a warning on untreated tickets. Introduces options TICKET_DELAY_BEFORE_FIRST_RESPONSE and TICKET_DELAY_SINCE_LAST_RESPONSE
2022-02-21 11:43:32 +01:00
Thomas Negre
e8c48a06c0
Correct typos in ticket.lib
2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907
Clean code
2022-02-21 11:26:10 +01:00
atm-greg
7b655a1ae2
fix missing hooks and line total for totalizable extrafields
2022-02-21 11:25:28 +01:00
steve
0e3ec05028
wip: dolGetButtonAction Nomail
2022-02-21 11:12:06 +01:00
steve
3a2fcaae6c
wip: SendMail dolGetButtonAction
2022-02-21 10:12:28 +01:00
Laurent Destailleur
678c3bdb76
Fix switch to login page
2022-02-20 18:07:10 +01:00
ptibogxiv
b8d82671b3
Update filecheck.php
2022-02-20 10:39:59 +01:00
Alexandre SPANGARO
546b3dd4d5
Fix travis
2022-02-20 05:17:06 +01:00
ptibogxiv
996dcdde82
FIX error with php8
2022-02-19 18:34:53 +01:00
Laurent Destailleur
6b8793e171
Fix sql error on web service
2022-02-19 00:41:45 +01:00
Laurent Destailleur
f0f81cd2cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-18 21:53:46 +01:00
Laurent Destailleur
9a3d8022f3
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-18 21:53:38 +01:00
Laurent Destailleur
05f0f1733d
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-18 21:52:33 +01:00
Laurent Destailleur
bd58cf1b37
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-18 21:52:18 +01:00
Laurent Destailleur
b0f538387e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
e948db69f2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-18 21:46:01 +01:00
Laurent Destailleur
28d8a28be6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-18 21:45:54 +01:00
Laurent Destailleur
959aa0ce59
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-02-18 21:44:34 +01:00
Laurent Destailleur
c770e232ff
Merge pull request #20120 from RomainDeschamps/14.0
...
Add ticket page in user personal landpage
2022-02-18 21:09:23 +01:00
Laurent Destailleur
1c129fd3ea
Merge pull request #20038 from atm-quentin/FIX_12_sort_ht_amount
...
FIX sort amount ht on cabyprodserv.php
2022-02-18 21:04:52 +01:00
Laurent Destailleur
3e4279f37b
Merge pull request #20083 from ATM-Consulting/FIX_VacantPosition
...
FIX : HRM | Vacant position option
2022-02-18 20:47:54 +01:00
Laurent Destailleur
72df61b175
Merge pull request #20107 from henrynopo/patch-2
...
Fix bug - List of supplier order - to show total line
2022-02-18 20:42:30 +01:00
Laurent Destailleur
f295fa8ad4
Merge pull request #20108 from atm-maxime/fix_15_missing_hooks
...
Fix : add missing formobjectoptions hook on 3 cards
2022-02-18 20:23:09 +01:00
Laurent Destailleur
91eafaea98
Merge pull request #20109 from aspangaro/14p33
...
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
2022-02-18 20:21:43 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency
...
fix rounding for price and display currency
2022-02-18 20:19:02 +01:00
Laurent Destailleur
38ddfda95c
Merge pull request #20114 from dolibit-ut/patch-373
...
add GitHub
2022-02-18 20:14:59 +01:00
Romain DESCHAMPS
5eb4d3408c
Update param_ihm.php
2022-02-18 19:31:42 +01:00
Laurent Destailleur
0517e2e2d3
Fix error
2022-02-18 18:35:21 +01:00
lvessiller
1107a60b58
FIX compute rule in FEC import
2022-02-18 16:53:55 +01:00
Laurent Destailleur
3b6f7bff66
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136
FIX Debug v15
2022-02-18 16:24:11 +01:00
Laurent Destailleur
cd9c1acafe
Fix missing token
2022-02-18 16:09:23 +01:00
Laurent Destailleur
f4f03d03f2
Fix link
2022-02-18 15:23:13 +01:00
Laurent Destailleur
87a5defbd3
Comment
2022-02-18 15:11:54 +01:00
Laurent Destailleur
e41e0f069a
Fix creator in PDF. Add log to help to find strange bug
2022-02-18 15:09:52 +01:00
Atm-Gregr
30cde100ff
trad us
2022-02-18 14:41:29 +01:00
Laurent Destailleur
61e91656e0
FIX setup of member module
...
FIX generation of business cards
2022-02-18 14:14:34 +01:00
Laurent Destailleur
694ea8830b
Fix missing name and type into template
2022-02-18 13:46:12 +01:00
Laurent Destailleur
dee5d8f9e8
Standardize name of button
2022-02-18 13:45:28 +01:00
UT from dolibit
8a0ee772d3
add GitHub
...
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid} ', '', 0);
2022-02-18 13:10:38 +01:00
Laurent Destailleur
3ab2308124
Clean code
2022-02-18 12:36:05 +01:00
Laurent Destailleur
aec2579c41
Clean code
2022-02-18 12:22:53 +01:00
stickler-ci
b5afa27774
Fixing style errors.
2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84
fix rounding for price and display currency
2022-02-18 10:50:00 +01:00
Alexandre SPANGARO
3f109aa911
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
2022-02-18 09:24:12 +01:00
Maxime Kohlhaas
7a457478d5
Fix : add missing formobjectoptions hook on 3 cards
2022-02-18 08:23:12 +01:00
Henry
c32cc660a3
Update list.php
2022-02-18 08:16:56 +08:00
Laurent Destailleur
6b8312aab0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-17 20:50:03 +01:00
Laurent Destailleur
28e6acdae3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-17 20:46:36 +01:00
Laurent Destailleur
aacd439765
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/api/class/api_setup.class.php
2022-02-17 20:46:20 +01:00
Laurent Destailleur
80f1cd8857
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-02-17 20:43:51 +01:00
Laurent Destailleur
edc984c6e3
# WARNING: head commit changed in the meantime
...
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-02-17 20:43:22 +01:00
Laurent Destailleur
120a4a608e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-17 20:41:20 +01:00
Laurent Destailleur
b013c9a15f
Fix duplicate div
2022-02-17 20:37:39 +01:00
Laurent Destailleur
21ebedc755
Fix trans
2022-02-17 20:10:09 +01:00
Laurent Destailleur
6e5c7358de
Merge branch 'develop' into NEW_Needs_net_tab_on_bom
2022-02-17 20:06:38 +01:00
Laurent Destailleur
64ddead1b5
Merge pull request #20051 from ptibogxiv/patch-3
...
FIX API REST for setup values
2022-02-17 20:05:17 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read
...
ticket config: auto read ticket
2022-02-17 19:58:01 +01:00
Laurent Destailleur
39bb854ef8
Update ticket.php
2022-02-17 19:57:45 +01:00
Laurent Destailleur
2f3411a31b
Merge pull request #20044 from atm-arnaud/FIX_societe_create_user_author
...
FIX wrong user author
2022-02-17 19:54:53 +01:00
Laurent Destailleur
7e33794f66
Merge pull request #20047 from simicar29/14-dolistore
...
Fix urlencode breaking links in Market Place page
2022-02-17 19:54:04 +01:00
Laurent Destailleur
ea7051f6a0
Merge pull request #20052 from ptibogxiv/patch-4
...
FIX API REST setup
2022-02-17 19:53:19 +01:00
Laurent Destailleur
a71bdc4024
Merge pull request #20053 from ptibogxiv/patch-5
...
NEW API REST filter states by country
2022-02-17 19:53:00 +01:00
Laurent Destailleur
98375d634c
Merge pull request #20055 from Ahuahuachi/fix-20042
...
Update Mexican legal entities
2022-02-17 19:50:47 +01:00
Laurent Destailleur
b393a1277f
Update 14.0.0-15.0.0.sql
2022-02-17 19:50:21 +01:00
Laurent Destailleur
511aee6005
Merge pull request #20057 from aspangaro/14p31
...
FIX Accountancy - Order by accounting account on summary page
2022-02-17 19:44:59 +01:00
Laurent Destailleur
f1d84f5728
Merge pull request #20060 from hregis/fix_missing_default_or_current_value
...
FIX missing default or current value
2022-02-17 19:43:29 +01:00
Laurent Destailleur
69730838f4
Merge pull request #20061 from Hystepik/develop#2
...
Close #19930 : tag management in KM list
2022-02-17 19:32:59 +01:00
Laurent Destailleur
c20d824999
Tables of module ticket are create only when module is enabled.
2022-02-17 19:30:18 +01:00
Laurent Destailleur
68beafe599
Removed useless indexes
2022-02-17 19:24:44 +01:00
Laurent Destailleur
33fc41b733
Merge pull request #20062 from atm-adrien/FIX_modify_invoices_rec_table
...
FIX : There's no field "ref" in llx_facture_fourn_rec table
2022-02-17 19:23:19 +01:00
Laurent Destailleur
3dc2a89d03
Merge pull request #20099 from henrynopo/patch-1
...
Supplier Order - to disable the default pdf generation of
2022-02-17 19:20:16 +01:00
Laurent Destailleur
2e744a4517
Update create_ticket.php
2022-02-17 19:18:22 +01:00
Laurent Destailleur
cbf15af853
Merge pull request #20095 from Hystepik/develop#3
...
Fix : fix php 8.0 warnings
2022-02-17 19:12:39 +01:00
Laurent Destailleur
85327f28b0
Update login.tpl.php
2022-02-17 19:12:24 +01:00
Laurent Destailleur
e8b011cf2c
Merge pull request #20096 from atm-adrien/FIX_total_cost_for_sub_bom
...
FIX : Costs for BOM
2022-02-17 19:11:17 +01:00
Laurent Destailleur
c529af90c6
Fix trans
2022-02-17 12:06:48 +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
Henry
bb08341dc3
to disable the default pdf generation
2022-02-17 18:34:23 +08:00
Laurent Destailleur
67cb268324
Update example conf file with force_install_lockinstall
2022-02-17 11:33:34 +01:00
stickler-ci
13cfe858f2
Fixing style errors.
2022-02-17 09:53:02 +00:00
Adrien Raze
f16567a44a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_total_cost_for_sub_bom
2022-02-17 10:45:19 +01:00
lmarcouiller
aea9c2e427
Fix : fix php 8.0 warnings
2022-02-17 10:22:58 +01:00
Atm-Gregr
8d14d18638
Merge branch '15.0' of github.com:Dolibarr/dolibarr into FIX_VacantPosition
2022-02-17 09:59:36 +01:00
Thomas Negre
1c8c98ac0f
fix ticket public interface:
...
When sending an email to the customer,
If a custom URL had been provided for ticket public interface,
the link provided in the email did lead to the index of the public interface.
We want it to lead to /view.php
2022-02-17 09:53:36 +01:00
Alexandre SPANGARO
96fcd7cae2
Fix travis
2022-02-17 05:41:37 +01:00
Alexandre SPANGARO
33af0eb0fb
Fix travis
2022-02-17 05:21:48 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code
2022-02-17 04:15:03 +01:00
Alexandre SPANGARO
ccbbc98f7a
Fix travis
2022-02-17 04:13:02 +01:00
Laurent Destailleur
626a5b90f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:22:49 +01:00
Laurent Destailleur
eb8caf7419
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-02-16 21:17:19 +01:00
Laurent Destailleur
c16e013b99
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:13:49 +01:00
Laurent Destailleur
131ae92cc6
FIX #20063
2022-02-16 21:05:23 +01:00
lvessiller
9b1d800311
NEW add triiger and event on totally received status
2022-02-16 20:52:01 +01:00
lvessiller
690a91d546
NEW automatically set totally received status in reception
2022-02-16 20:51:47 +01:00
Laurent Destailleur
dfcc49d466
Doc
2022-02-16 20:50:27 +01:00
Laurent Destailleur
67168ffb16
Merge pull request #20065 from Easya-Solutions/new-reception-all-products
...
NEW automatically set totally received status in reception
2022-02-16 20:48:50 +01:00
Laurent Destailleur
ea4eed31f5
Merge pull request #20066 from javieralapps4up/develop
...
FIX Andorra needs Code Banque
2022-02-16 20:38:26 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix
...
Fixes expensereport downloads
2022-02-16 20:37:32 +01:00
Laurent Destailleur
5cf8fae151
Merge pull request #20072 from fappels/15_fix_barcode_viewimage
...
Fix barcode viewimage regression on yogosha8628
2022-02-16 20:36:59 +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
ed10db668d
Merge pull request #20073 from atm-quentin/FIX_13_combinations
...
FIX weight is lost if it's comma on combinations card
2022-02-16 20:34:24 +01:00
Laurent Destailleur
73e2b13418
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-16 20:32:30 +01:00
Laurent Destailleur
2a18bce2f3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/api/index.php
htdocs/langs/en_US/productbatch.lang
htdocs/langs/fr_FR/productbatch.lang
htdocs/ticket/list.php
2022-02-16 20:31:55 +01:00
Laurent Destailleur
906651d404
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-16 20:27:26 +01:00
Laurent Destailleur
e0563d2bef
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity
...
add missing entity check on list of withdraws on index of paymentbyba…
2022-02-16 20:26:39 +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
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert
...
manage details of prelevment line for bank transfer
2022-02-16 20:22:54 +01:00
Laurent Destailleur
ab2d3460d7
Merge pull request #20080 from Easya-Solutions/new-total-mark-rate-in-list
...
NEW total mark rate in list
2022-02-16 20:22:15 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14
...
FIX: correct warehouse document location
2022-02-16 20:18:43 +01:00
Laurent Destailleur
357f6e234a
Merge pull request #20086 from altairis-noe/duplicate_serial_move_trans
...
FIX : translation string instead of error message text
2022-02-16 20:18:01 +01:00
Alexandre SPANGARO
453449324e
Fix travis
2022-02-16 18:09:32 +01:00
Laurent Destailleur
1ede8a30b2
Missing NOSESSION
2022-02-16 17:49:05 +01:00
Florian
aa2a57ff95
Check that the value is not an array
2022-02-16 17:00:54 +01:00
Florian
7ed6ca6ec6
FIX ISSUE DB_ERROR_SYNTAX-#18921
2022-02-16 17:00:50 +01:00
lmarcouiller
a9496220b5
Fix : warnings php 8.0
2022-02-16 16:43:52 +01:00
Atm-Gregr
30d3a782de
precommit stickler
2022-02-16 16:30:54 +01:00
Atm-Gregr
5f09ac61b2
insert precommit1
2022-02-16 16:27:47 +01:00
Atm-Gregr
1f2659d411
insert precommit
2022-02-16 16:26:57 +01:00
Atm-Gregr
038298a638
change button and add title
2022-02-16 16:10:48 +01:00
Noé Cendrier
98c50f531c
translation string instead of error message text
2022-02-16 15:57:39 +01:00
Atm-Gregr
dbcbda642a
fix sticker 1
2022-02-16 15:53:06 +01:00
Atm-Gregr
7868aa305b
fix filter
2022-02-16 15:48:23 +01:00
Atm-Gregr
1a41232181
add vacant position option
2022-02-16 15:24:35 +01:00
BB2A Anthony Berton
fd478ba3fa
add param for md theme
2022-02-16 15:13:50 +01:00
Laurent Destailleur
4a343247b0
Return a 404 http code when CSRF protection fails
2022-02-16 14:34:32 +01:00
Alexandre SPANGARO
9a0a222b63
Fix stickler-ci
2022-02-16 14:21:45 +01:00
Laurent Destailleur
69266ae61f
Fix text
2022-02-16 14:14:30 +01:00
Laurent Destailleur
60ada5fe72
Can filter on status purchase on list of products
2022-02-16 14:06:16 +01:00
lvessiller
7e17167faf
NEW total mark rate in list
2022-02-16 11:45:29 +01:00
Alexis LAURIER
ff8dcdc4b7
manage details of prelevment line for bank transfer
2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2
add missing entity check on list of withdraws on index of paymentbybanktransfert
2022-02-16 10:26:44 +01:00
Vincent Dieltiens
392f468a13
allow to add more CSS and more params on html fields
2022-02-16 10:01:55 +01:00
Alexandre SPANGARO
948f20c2b6
Add a graphical option to define duration per year for depreciation
2022-02-16 05:18:29 +01:00
Alexandre SPANGARO
11d1d9a0af
Fix stickler-ci
2022-02-16 05:17:38 +01:00
Laurent Destailleur
453871bf38
css
2022-02-15 23:01:14 +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
935482ee22
uniformize
2022-02-15 19:04:18 +01:00
Frédéric FRANCE
dad73b755e
fix merge
2022-02-15 18:46:41 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1
2022-02-15 18:44:06 +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
d546e11fba
Update chargesociales.class.php
2022-02-15 17:13:08 +01:00
Frédéric FRANCE
ef04ce1e05
Update fichinterrec.class.php
2022-02-15 17:10:32 +01:00
Frédéric FRANCE
9dc2cc82cb
Update supplier_proposal.class.php
2022-02-15 17:07:43 +01:00
Frédéric FRANCE
7341e7ed07
Update don.class.php
2022-02-15 17:06:04 +01:00
Laurent Destailleur
50853205bb
Support placeholder on multiselect components
2022-02-15 16:43:47 +01:00
Christophe Battarel
ebada46a07
fix context for createfromclone
2022-02-15 12:14:48 +01:00
Francis Appels
95c0e72956
Fix barcode viewimage regression on yogosha8628
2022-02-15 11:37:24 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923
FIX wieght is loose if it's comma on combinations
2022-02-15 11:31:09 +01:00
Frédéric FRANCE
502aa1b14b
Update paiement.class.php
2022-02-15 11:21:40 +01:00
Frédéric FRANCE
0feb6e8275
Update fournisseur.facture.class.php
2022-02-15 11:18:14 +01:00
Frédéric FRANCE
c474ee216f
Update expedition.class.php
2022-02-15 11:15:34 +01:00
Frédéric FRANCE
710e970389
Update facture-rec.class.php
2022-02-15 11:13:22 +01:00
Laurent Destailleur
0e664cc969
Fix API call from ajax
2022-02-15 11:12:08 +01:00
Frédéric FRANCE
ed4622790e
Update asset.class.php
2022-02-15 11:10:02 +01:00
Frédéric FRANCE
85d158d302
Update adherent.class.php
2022-02-15 11:09:07 +01:00
Frédéric FRANCE
71d2d6194f
Update categorie.class.php
2022-02-15 11:06:49 +01:00
Frédéric FRANCE
a6a1e3886a
Update propal.class.php
2022-02-15 11:03:50 +01:00
Laurent Destailleur
1b53ed09f9
Work on custom report feature
2022-02-15 11:03:48 +01:00
Frédéric FRANCE
09c9b28b57
Update commande.class.php
2022-02-15 11:02:22 +01:00
Frédéric FRANCE
11fc0da398
Update fournisseur.commande.class.php
2022-02-15 11:00:05 +01:00
Frédéric FRANCE
b2815c4973
add hook in propal tooltip
2022-02-15 10:53:33 +01:00
Frédéric FRANCE
c90f9b5681
add hook in order tooltip
2022-02-15 10:51:06 +01:00
lmarcouiller
885d188be3
use of require_once
2022-02-15 10:41:55 +01:00
Christophe Battarel
288c58e533
fix parent line on propal
2022-02-15 10:41:21 +01:00
Christophe Battarel
01ef9b64ee
fix parent line on create with no originid
2022-02-15 10:34:10 +01:00
Adrien Raze
34d2e0b8b4
FIX : Fixed sub bom costs problems
2022-02-15 10:29:42 +01:00
Christophe Battarel
6c6c854eae
fix parent line on create with origin
2022-02-15 10:23:43 +01:00
Vincent Dieltiens
af0000d568
Fixes expensereport downloads
2022-02-15 10:13:28 +01:00
lvessiller
533bf15b86
NEW add triiger and event on totally received status
2022-02-15 09:54:40 +01:00
iouston
4808442bc8
keep the default value for target in getnomurl to ''
2022-02-15 09:34:51 +01:00
iouston
1bc80df643
keep the default value for target in getnomurl to ''
2022-02-15 09:32:27 +01:00
Laurent Destailleur
9173eec8ac
Fix input lost
2022-02-14 23:02:43 +01:00
Laurent Destailleur
54bf8ed1ed
Fix link
2022-02-14 22:53:24 +01:00
Laurent Destailleur
b6879d7953
css
2022-02-14 22:38:45 +01:00
javieralapps4up
81c2631b00
FIX Andorra needs Code Banque
2022-02-14 20:06:42 +01:00
lvessiller
384e1d515b
NEW automatically set totally received status in reception
2022-02-14 18:07:18 +01:00
Alexandre SPANGARO
1d974f67f0
Fix stickler-ci
2022-02-14 16:17:19 +01:00
atm-greg
96c7a9f77c
fix pdf_cornas
2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133
fix pdf_mucadet
2022-02-14 15:11:26 +01:00
Adrien Raze
3305965c85
FIX : Error with selectForForms function
2022-02-14 15:04:12 +01:00
Adrien Raze
562c3cf958
FIX : There's no field "ref" in llx_facture_fourn_rec table
2022-02-14 14:15:38 +01:00
Laurent Destailleur
05bd37a921
Fix menu "New" when using paranoiac MAIN_SECURITY_CSRF_WITH_TOKEN = 3
2022-02-14 12:29:00 +01:00
Laurent Destailleur
ff17fe5ae7
Fix reponsive
2022-02-14 12:28:19 +01:00
Laurent Destailleur
dce996a53f
Reponsive
2022-02-14 12:28:11 +01:00
Laurent Destailleur
5d90a00728
Debug v15
2022-02-14 12:27:35 +01:00
Laurent Destailleur
f2d5e43381
Fix showempty for select_salesrepresentatives
2022-02-14 12:25:48 +01:00
lmarcouiller
a3c1c707a4
Close #19930 : tag management in KM list
2022-02-14 12:09:57 +01:00
Alexandre SPANGARO
0d1ee4e19f
Fix stickler-ci
2022-02-14 11:51:05 +01:00
Alexandre SPANGARO
a17ac09fd0
Resolve stickler-ci
2022-02-14 11:03:44 +01:00
Regis Houssin
15b7f37027
FIX missing default or current value
2022-02-14 09:14:06 +01:00
Alexandre SPANGARO
b7d26c2e5c
Merge branch '16a12_assets_code' of https://github.com/aspangaro/dolibarr into 16a12_assets_code
2022-02-14 05:34:06 +01:00
Alexandre SPANGARO
99aa8dc2b1
Lang
2022-02-14 05:33:57 +01:00
stickler-ci
2d9e303abf
Fixing style errors.
2022-02-14 04:18:50 +00:00
Alexandre SPANGARO
bb96856206
Lang
2022-02-14 05:16:08 +01:00
Alexandre SPANGARO
3e3421efb4
Merge branch '16a12_assets_code' of https://github.com/aspangaro/dolibarr into 16a12_assets_code
2022-02-14 05:15:39 +01:00
Alexandre SPANGARO
d869adb370
Asser
2022-02-14 05:15:28 +01:00
stickler-ci
526157dfcb
Fixing style errors.
2022-02-14 03:56:45 +00:00
Alexandre SPANGARO
1cc8428f53
Merge branch '16a12_assets_code' of https://github.com/aspangaro/dolibarr into 16a12_assets_code
2022-02-14 04:52:54 +01:00
Alexandre SPANGARO
6734a3575e
Core
2022-02-14 04:52:39 +01:00
stickler-ci
dd5be840aa
Fixing style errors.
2022-02-14 03:31:30 +00:00
Alexandre SPANGARO
d5e521c87b
Accountancy
2022-02-14 04:27:52 +01:00
Alexandre SPANGARO
6593449806
Dictionary
2022-02-14 04:20:42 +01:00
Alexandre SPANGARO
9349e2df7c
FIX Accountancy - Order by accounting account on summary page
2022-02-13 21:11:45 +01:00
Laurent Destailleur
27b94ceea1
Debug v15
2022-02-13 19:26:16 +01:00
Laurent Destailleur
a1f88c1186
Fix reponsive
2022-02-13 18:03:29 +01:00
Alexandre SPANGARO
5a86f99890
FIX Disable customer type by default if type prospect/customer is disabled
2022-02-13 17:53:22 +01:00
Laurent Destailleur
a52f1d1094
Reponsive
2022-02-13 17:33:45 +01:00
Laurent Destailleur
d5e5e8d436
Debug v15
2022-02-13 17:09:40 +01:00
Laurent Destailleur
1097111706
Fix autofocus
2022-02-13 16:37:08 +01:00
Laurent Destailleur
cafdcb7206
Show translation value
2022-02-13 16:13:38 +01:00
Alexandre SPANGARO
a15353fa33
FIX Disable customer type by default if type prospect/customer is disabled
2022-02-13 13:42:40 +01:00
ptibogxiv
061dd565cc
Update api_setup.class.php
2022-02-13 13:22:01 +01:00
ptibogxiv
f2b88c6d7c
Update api_setup.class.php
2022-02-13 10:09:39 +01:00
ptibogxiv
8d3e97bab9
Update api_setup.class.php
2022-02-12 19:21:07 +01:00
ptibogxiv
54af0cf47a
NEW API REST filter states by country
2022-02-12 19:02:00 +01:00
ptibogxiv
a5a8f30939
FIX API REST setup
...
bad words
2022-02-12 17:08:43 +01:00
ptibogxiv
11e15255bd
FIX API REST for setup values
2022-02-12 16:59:29 +01:00
Laurent Destailleur
b98f547c4a
Fix autoselect
2022-02-12 12:12:50 +01:00
Laurent Destailleur
8000adb694
Fix test
2022-02-11 18:50:12 +01:00
Laurent Destailleur
eff2fc1e9e
Complete option MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT
2022-02-11 18:19:50 +01:00
Laurent Destailleur
b623b88674
css
2022-02-11 18:06:39 +01:00
Laurent Destailleur
56f5b471bc
Fix menu "New" when using paranoiac MAIN_SECURITY_CSRF_WITH_TOKEN = 3
2022-02-11 15:30:45 +01:00
Marc GUENNEUGUES
c552030b69
Fix urlencode breaking links in Market Place page
2022-02-11 15:18:38 +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
89ffe5baba
Clean code for param of dol_stringtotime()
2022-02-11 14:07:10 +01:00
Laurent Destailleur
32af067e1e
Code comment
2022-02-11 13:01:29 +01:00
Laurent Destailleur
b84fd3ec3d
Clean code
2022-02-11 12:46:45 +01:00
atm-arnaud
455247565d
FIX wrong user author
2022-02-11 11:40: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
Alfredo Altamirano
88a33c730a
FIX #20042 Update Mexican legal entities
2022-02-11 02:01:25 -06:00
Laurent Destailleur
30d7f807e4
Fix url
2022-02-10 21:03:10 +01:00
Laurent Destailleur
9ba998e3ba
Fix some regressions
2022-02-10 19:36:33 +01:00
Laurent Destailleur
52bacbd914
Tables for emailing and asset modules are loaded on module activation
2022-02-10 19:21:15 +01:00
Laurent Destailleur
3bc064ac55
Add status on tasks
2022-02-10 19:08:35 +01:00
Laurent Destailleur
4da2056021
Doc
2022-02-10 19:05:05 +01:00
Noé Cendrier
664860863e
correct warehouse document location
2022-02-10 17:59:12 +01:00
Thomas Negre
4c5ddcf030
ticket config: add constant TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND to admin panel
2022-02-10 17:57:28 +01:00
Thomas Negre
c5d1310373
handle workflow constants in appropriate category
2022-02-10 17:51:32 +01:00
Thomas Negre
39bd5dd6dc
ticket config : add TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND option to config panel
2022-02-10 17:50:59 +01:00
Laurent Destailleur
fc36849093
css
2022-02-10 17:31:55 +01:00
Quentin VIAL-GOUTEYRON
d819d427c3
FIX sort amount ht
2022-02-10 16:46:19 +01:00
Laurent Destailleur
2c6b6ce4d1
Fix sql syntax error
2022-02-10 16:35:50 +01:00
Laurent Destailleur
16e4e736fd
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-10 16:28:29 +01:00
Laurent Destailleur
10d2e0cec0
Fix link to reconcile
2022-02-10 16:27:40 +01:00
Laurent Destailleur
9e17fe8f4e
Fix bad cancelation
2022-02-10 15:16:59 +01:00
Laurent Destailleur
2b65ba4a45
FIX insert free price using price without tax on order
2022-02-10 15:03:41 +01:00
Quentin VIAL-GOUTEYRON
cd955930b6
change bt link
2022-02-10 15:00:55 +01:00
Laurent Destailleur
e0377d788c
Send position x,y of cursor into an ACE editors on POST form
2022-02-10 14:34:04 +01:00
Laurent Destailleur
535c04e86e
Fix region of LIVORNO
2022-02-10 14:18:13 +01:00
Laurent Destailleur
b69beb98b8
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-10 13:30:22 +01:00
Laurent Destailleur
024f12aa9b
Fix php5.6
2022-02-10 13:18:21 +01:00
Laurent Destailleur
c4c15fc105
Fix warnings
2022-02-10 13:16:51 +01:00
Laurent Destailleur
d2af490b33
Fix missing key on a new table
2022-02-10 13:12:00 +01:00
Laurent Destailleur
ff3fbd1cf8
Fix preselected field
2022-02-10 13:06:51 +01:00
Laurent Destailleur
21f0264683
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03
Fix pb with bulk payment feature
2022-02-10 13:01:47 +01:00
Laurent Destailleur
954938cd75
Fix buttons
2022-02-10 12:33:28 +01:00
Laurent Destailleur
f787512592
Fix buttons
2022-02-10 12:30:29 +01:00
Laurent Destailleur
760b8caa31
Fix migration
2022-02-10 11:26:36 +01:00
Laurent Destailleur
d69f9eca40
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-10 11:23:45 +01:00
Laurent Destailleur
8db6152a4d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-10 11:23:00 +01:00
Laurent Destailleur
6c8fafddf6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2022-02-10 11:20:09 +01:00
Laurent Destailleur
a40f76c1d8
Merge
2022-02-10 11:15:59 +01:00
Laurent Destailleur
40f0aa45c8
Merge
2022-02-10 11:15:45 +01:00
Laurent Destailleur
9412bcdba0
Merge pull request #20009 from OPEN-DSI/new_variants_remake_sql2
...
NEW: Update variants to standard card and list (SQL)
2022-02-10 11:03:32 +01:00
Laurent Destailleur
d0f3274570
Merge pull request #19979 from ATM-Consulting/FIX_14.0_error_converttoreduc_with_multicurrency
...
fix bad array index for multicurrency
2022-02-10 10:56:42 +01:00
Quentin VIAL-GOUTEYRON
dd0202de47
fix comment doc
2022-02-10 10:46:04 +01:00
Laurent Destailleur
7cd9c6b7ba
Merge pull request #20003 from ptibogxiv/patch-2
...
FIX api product with subproduct
2022-02-10 10:25:40 +01:00
Laurent Destailleur
e901949531
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-10 10:23:52 +01:00
Laurent Destailleur
06fe8c391e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/install/mysql/tables/llx_propaldet.sql
2022-02-10 10:23:42 +01:00
stickler-ci
7cf9448609
Fixing style errors.
2022-02-10 09:22:53 +00:00
Regis Houssin
faec54ba3b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into fix_wrong_div_name
2022-02-10 10:18:45 +01:00
Regis Houssin
3eabeb2380
FIX broken feature, wrong div name again
2022-02-10 10:18:06 +01:00
Laurent Destailleur
65b81eddf4
Merge pull request #20000 from aspangaro/14p31
...
FIX Propal - Missing field import_key in import propal line
2022-02-10 10:17:41 +01:00
Laurent Destailleur
f4913745d0
Merge pull request #20017 from Easya-Solutions/new-product-list-thumbnail
...
NEW thumbnail field in product list
2022-02-10 10:14:55 +01:00
Laurent Destailleur
11bef4e681
Merge branch 'develop' into 14_fix_sql_extrafields
2022-02-10 10:13:24 +01:00
Laurent Destailleur
e210952f74
Update extrafields.class.php
2022-02-10 10:11:46 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR
...
NEW Recurring vendor invoices
2022-02-10 10:09:47 +01:00
Quentin VIAL-GOUTEYRON
2260276bed
add tooltip
2022-02-10 10:09:36 +01:00
Laurent Destailleur
6ff39da34d
Update 15.0.0-16.0.0.sql
2022-02-10 10:09:05 +01:00
Laurent Destailleur
d5d34930a8
Update card.php
2022-02-10 09:58:08 +01:00
Laurent Destailleur
9a371cb076
Trans
2022-02-10 09:56:01 +01:00
Regis Houssin
8dffa020b4
FIX broken feature, wrong div name
2022-02-10 09:54:09 +01:00
Laurent Destailleur
00ce52f753
Merge pull request #20031 from Easya-Solutions/new-takepos-rule-barcode
...
NEW barcode rule to insert product in takepos
2022-02-10 09:34:53 +01:00
Laurent Destailleur
3c49dddc02
Merge pull request #20026 from cfoellmann/PR/fix-vat-double
...
fix vat double in commande PDF
2022-02-10 09:31:27 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php
2022-02-10 09:29:11 +01:00
Regis Houssin
cc8af7b1d0
FIX not active value are not hidden (missing filter of field) ( #20032 )
...
* FIX not active value are not hidden (missing filter of field)
* FIX wrong category table and wrong object id
2022-02-10 09:19:14 +01:00
Laurent Destailleur
eda401dea0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-09 21:14:06 +01:00
Laurent Destailleur
0b63ac638e
FIX API caan now be used in a preflight mode by Ajax.
2022-02-09 21:12:06 +01:00
Laurent Destailleur
59f749a65f
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-09 18:11:09 +01:00
Laurent Destailleur
5a37b2c649
Fix API call
2022-02-09 18:10:21 +01:00
Laurent Destailleur
fe01f75e97
Fix API_ENDPOINT_RULES with api of external modules
2022-02-09 17:50:26 +01:00
lvessiller
0d68846b3a
FIX add filter on categories
2022-02-09 17:44:48 +01:00
Laurent Destailleur
c7f99f140e
Fix remove validator
2022-02-09 17:41:32 +01:00
Laurent Destailleur
ce1a08baf6
Fix phpcs
2022-02-09 16:59:40 +01:00
Laurent Destailleur
7e9a50a113
Fix phpcs
2022-02-09 16:58:13 +01:00
lvessiller
25497018c7
FIX group by qty in update line
2022-02-09 16:49:40 +01:00
lvessiller
44e9b13f30
NEW barcode rule to insert product in takepos
2022-02-09 16:37:41 +01:00
Quentin VIAL-GOUTEYRON
9e667e0155
NEW Needed nets bom
2022-02-09 15:55:21 +01:00
noec764
d9bac75a63
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet
2022-02-09 15:33:45 +01:00
Laurent Destailleur
558db1b935
Fix #yogosha8845
2022-02-09 15:29:21 +01:00
Laurent Destailleur
47800aebfa
Fix phpunit and mode save after opening a ref
2022-02-09 15:21:25 +01:00
Laurent Destailleur
7055d326e4
FIX rtl languages
2022-02-09 13:24:11 +01:00
Laurent Destailleur
6e6c57d0e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-09 13:22:53 +01:00
Laurent Destailleur
7c78934d08
FIX rtl languages
2022-02-09 13:22:38 +01:00
Laurent Destailleur
3653e8244b
NEW Implement the generic method for Kaban views
2022-02-09 13:22:23 +01:00
Noé Courtier
e4c1978e12
Change of SQL request when fetching CommandeFournisseurLigne
2022-02-09 12:24:33 +01:00
Adrien Raze
194959c61c
FIX : Fixing PR returns
2022-02-09 10:03:30 +01:00
atm-greg
4c6fd42e3a
fix with eldy recommendations
2022-02-09 09:47:48 +01:00
Christian Foellmann
e0a3820b9c
fix double VAT line in commande PDF template
2022-02-09 08:01:24 +01:00
Laurent Destailleur
a91bdad8de
Fix responsive
2022-02-08 12:01:48 +01:00
lvessiller
2e71c21208
NEW thumbnail field in product list
2022-02-08 10:12:37 +01:00
Florian HENRY
316cb9e4e3
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_sql_extrafields
2022-02-08 08:46:21 +01:00
Florian HENRY
3f2c04a53c
fix sql error return
2022-02-08 08:46:15 +01:00
Laurent Destailleur
bfa9986736
Merge pull request #20013 from thomas-Ngr/develop_db_ticket_last_message_date
...
New : ticket add last_msg_sent field
2022-02-07 20:54:26 +01:00
Laurent Destailleur
c496e6eb51
doc
2022-02-07 20:53:13 +01:00
Thomas Negre
b6b5eb633b
only update last_msg_date if a message is really sent.
2022-02-07 17:38:32 +01:00
Florian HENRY
e672b6f6e0
fix: in some case index do not exists and return an error
2022-02-07 16:41:45 +01:00
Florian HENRY
30779be77e
fix: if capital is not numeric just display input value
2022-02-07 16:36:47 +01:00
Florian HENRY
228142684b
fix: if capital is not numeric just display input value
2022-02-07 16:33:27 +01:00
Laurent Destailleur
3b18462a62
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 15:51:01 +01:00
Laurent Destailleur
7f04b7dc3d
Fix button Cancel
2022-02-07 15:26:03 +01:00
Thomas Negre
26648e4f12
ticket : update date_last_msg_sent on message sending from backend or public interface
2022-02-07 15:19:13 +01:00
Thomas Negre
b21fdbb21e
add a field date_last_msg_sent in ticket.sql install file
...
modify migration script
2022-02-07 15:19:13 +01:00
Laurent Destailleur
53bac7ae0f
Fix menu
2022-02-07 15:16:11 +01:00
Laurent Destailleur
02ec11ff64
css
2022-02-07 15:07:03 +01:00
Laurent Destailleur
21db3c19dd
Trans
2022-02-07 14:49:10 +01:00
Adrien Raze
5bee821726
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_rec_invoices_15.0_newPR
2022-02-07 14:37:10 +01:00
Adrien Raze
ee52cac3ba
NEW : Template supplier invoices
2022-02-07 14:34:27 +01:00
Laurent Destailleur
fafe41294a
Clean install
2022-02-07 14:29:59 +01:00
Laurent Destailleur
31ca78acda
Sync transifex.
...
Fix install.
2022-02-07 14:25:20 +01:00
kamel
75653395fd
NEW: Update variants to standard card and list (SQL)
2022-02-07 10:12:41 +01:00
Laurent Destailleur
19fdf3dc18
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9
Fix section of attached files for salaries
2022-02-07 09:50:07 +01:00
Laurent Destailleur
856b83a202
CSS
2022-02-07 09:26:03 +01:00
Alexandre SPANGARO
3e4150fbc2
Translation
2022-02-07 05:02:59 +01:00
ptibogxiv
b18b049dca
FIX api product with subproduct
2022-02-06 22:55:37 +01:00
Laurent Destailleur
9b1f04209d
NEW Change in theme colors does not need to use the refresh button
2022-02-06 22:11:44 +01:00
Laurent Destailleur
3fa3cd28cd
clean code
2022-02-06 15:21:49 +01:00
Laurent Destailleur
3e6d922cc0
Merge pull request #19938 from bb2a/border-table-2
...
NEW - Border table
2022-02-06 14:59:31 +01:00
Alexandre SPANGARO
ea83b9c11c
FIX Propal - Missing field import_key in import propal line
2022-02-06 13:56:57 +01:00
Laurent Destailleur
6562b24e41
NEW Some core tables are created only at module activation
2022-02-06 13:31:44 +01:00
Laurent Destailleur
2991f992dc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-06 13:28:30 +01:00
Laurent Destailleur
e022b00d1e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-06 13:24:02 +01:00
Laurent Destailleur
c63ebfde29
Tables are loaded on module activation
2022-02-06 13:16:32 +01:00
Laurent Destailleur
cd491280cf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460
Fix remove dead code
2022-02-06 13:06:12 +01:00
Laurent Destailleur
f2120a6463
Merge pull request #19994 from defrance/patch-177
...
fix : duration in hour and min (not in second)
2022-02-06 12:35:59 +01:00
Laurent Destailleur
d1f3411bac
Update list_print_total.tpl.php
2022-02-06 12:35:33 +01:00
Laurent Destailleur
3b36465210
Fix missing allowed_in_frames
2022-02-06 12:17:42 +01:00
Laurent Destailleur
9c0fc59166
Fix #yogosha8791
2022-02-05 19:42:43 +01:00
habot-it
97850a6fbf
Add options in function pdf_pagefoot of pdf.lib.php
2022-02-05 12:22:18 +00:00
BENKE Charlene
9977761846
print the good format of totalisation
2022-02-05 12:12:37 +01:00
BENKE Charlene
1c87c6fd5d
Update list.php
...
first introduce à type of totalisation
2022-02-05 12:10:57 +01:00
ATM john
ba46d04d6e
Fix logic for form setup
2022-02-04 21:51:33 +01:00
Laurent Destailleur
faa226d875
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 20:34:26 +01:00
Laurent Destailleur
c53bac831d
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 20:33:32 +01:00
Laurent Destailleur
ba795310b5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 20:32:39 +01:00
Laurent Destailleur
7ade138590
Fix phpcs
2022-02-04 20:30:45 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance
...
NEW: leave requests: add field into type dictionary to block request if balance is negative
2022-02-04 20:23:04 +01:00
Laurent Destailleur
4e7ad489b2
Merge pull request #19995 from bb2a/patch-2
...
FIX - Hide ref subpruct
2022-02-04 20:14:52 +01:00
Laurent Destailleur
20ddd04d14
Make around 15 tables not created by default but at first module init.
2022-02-04 20:06:09 +01:00
Laurent Destailleur
c9a685e09d
Better error message
2022-02-04 19:21:47 +01:00
Laurent Destailleur
1e94ffa4d2
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 19:07:26 +01:00
Laurent Destailleur
836ffc2b02
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 19:06:32 +01:00
Anthony Berton
07c7209c0c
Update pdf.lib.php
2022-02-04 19:05:22 +01:00
Laurent Destailleur
63d35ecffd
Fix phpcs
2022-02-04 19:05:11 +01:00
BENKE Charlene
8d74b51009
fix : duration in hour and min (not in second)
...
use convertSecondToTime for totalise duration
2022-02-04 15:52:37 +01:00
Laurent Destailleur
7cc06a0ef9
# WARNING: head commit changed in the meantime
...
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-02-04 15:40:28 +01:00
BENKE Charlene
5f3c81daee
FIX if we have PRODUCT_USE_UNITS, task fail
...
we need public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
2022-02-04 15:35:03 +01:00
Laurent Destailleur
e85051aaaa
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 15:32:50 +01:00
Laurent Destailleur
3884c7b25f
Merge pull request #19894 from defrance/patch-176
...
FIX if we have PRODUCT_USE_UNITS, task fail
2022-02-04 15:32:24 +01:00
Gauthier PC portable 024
accf426f19
FIX : extrafields are not used yet + fix ihm
2022-02-04 15:14:30 +01:00
Laurent Destailleur
5249840402
FIX #yogosha8628
2022-02-04 15:14:10 +01:00
iouston
993e0d852c
fix parameter name
2022-02-04 15:01:32 +01:00
stickler-ci
7e6279e942
Fixing style errors.
2022-02-04 13:48:25 +00:00
iouston
0cc8e6873f
add attribute target on getNomurl()
2022-02-04 14:44:47 +01:00
stickler-ci
e8801bd7fc
Fixing style errors.
2022-02-04 13:42:07 +00:00
iouston
95aabd6ae3
add target attribute on getNomUrl
2022-02-04 14:38:34 +01:00
Laurent Destailleur
f99e19e729
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 13:19:55 +01:00
Laurent Destailleur
85e198283b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 13:18:26 +01:00
Laurent Destailleur
66430f6087
FIX #19939
2022-02-04 13:18:07 +01:00
Laurent Destailleur
e57bc01466
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/product/class/product.class.php
2022-02-04 13:02:45 +01:00
Laurent Destailleur
3f87db08d4
Update product.class.php
2022-02-04 12:55:31 +01:00
Laurent Destailleur
a81b437d04
Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search
...
NEW Can use ! to make a search that exclude a string
2022-02-04 12:51:26 +01:00
Laurent Destailleur
4324558d67
FIX backup fails
2022-02-04 12:34:42 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634
2022-02-04 12:31:40 +01:00
Laurent Destailleur
a7021008ba
Update pdf.lib.php
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-04 12:27:13 +01:00
Laurent Destailleur
eb644bf6bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 12:18:05 +01:00
Laurent Destailleur
aef646bb2a
Change order of options and removed useless option
2022-02-04 12:17:38 +01:00
Laurent Destailleur
bfea5cd69d
Merge pull request #19966 from habot-it/develop
...
Fix "Warning: This option make TCPDF library being crazy sometime and…
2022-02-04 12:14:26 +01:00
Laurent Destailleur
6894cb3925
Update pdf.lib.php
2022-02-04 12:14:11 +01:00
Laurent Destailleur
91b4cd43bb
Merge pull request #19946 from smil2k/feature/19944-develop
...
NEW add datem and type parameters to API to create movements
2022-02-04 11:11:46 +01:00
Laurent Destailleur
5294a9ae2f
Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function
...
Works on replace MAIN_DB_PREFIX by $db->prefix()
2022-02-04 11:09:51 +01:00
Laurent Destailleur
58b6512c15
Merge pull request #19963 from mschamp/develop
...
NEW #19294 implement detailed timespent in task of project API
2022-02-04 11:07:12 +01:00
Laurent Destailleur
15dca77330
Fix filter on search_categ
2022-02-04 11:00:16 +01:00
Laurent Destailleur
ef054bcef2
Merge pull request #19972 from habot-it/feat/add-parent-company
...
NEW Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
2022-02-04 10:47:35 +01:00
Laurent Destailleur
95833135f4
FIX #19974
2022-02-04 10:44:19 +01:00
Laurent Destailleur
ff39bcb058
Merge pull request #19975 from ksar-ksar/patch-13
...
FIX #19974 : llx_onlinesignature.sql allready exist
2022-02-04 10:35:56 +01:00
Laurent Destailleur
035081afbb
Merge pull request #19977 from atm-lena/NEW_OF_Child_Data
...
Add column "fk_parent_line" to llx_mrp_mo
2022-02-04 10:34:52 +01:00
Laurent Destailleur
3a9564ed88
Merge pull request #19976 from bb2a/patch-1
...
FIX - Trigger in setPaymentMethods for order
2022-02-04 09:23:11 +01:00
Laurent Destailleur
12f1aeb9df
Merge pull request #19982 from Easya-Solutions/new-margin-proposal-order-list
...
NEW add margin info in proposal and order list
2022-02-04 09:16:45 +01:00
Laurent Destailleur
a5bdd62268
Merge pull request #19981 from aspangaro/14p30
...
FIX Accountancy - Wrong name rule on FEC import
2022-02-04 09:12:11 +01:00
Laurent Destailleur
665737285e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-03 19:25:42 +01:00
Laurent Destailleur
840e3b5bc3
Fix url
2022-02-03 19:21:59 +01:00
lvessiller
241a65e2ae
NEW add margin info in proposal and order list
2022-02-03 10:39:03 +01:00
Alexandre SPANGARO
6d350f9a75
FIX Accountancy - Wrong name rule on import
2022-02-03 05:53:05 +01:00
mschamp
298304e9f8
Merge branch 'Dolibarr:develop' into develop
2022-02-02 20:42:09 +01:00
Laurent Destailleur
3db0a98594
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 18:26:15 +01:00
Laurent Destailleur
ef62cd0b18
css
2022-02-02 18:24:30 +01:00
Laurent Destailleur
0259f094bd
Fix trans
2022-02-02 18:04:11 +01:00
Laurent Destailleur
ba77700619
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea
Fix css
2022-02-02 17:57:20 +01:00
atm-lena
d6ff551702
Add column "fk_parent_line" to llx_mrp_mo
2022-02-02 15:15:22 +01:00
atm-greg
6035a374b7
fix bad array index
2022-02-02 14:44:38 +01:00
Laurent Destailleur
e813de1595
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-02 14:08:54 +01:00
Laurent Destailleur
5a89da8876
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-02 14:08:19 +01:00
Laurent Destailleur
815dd74de0
Fix missing information propagated to trigger
2022-02-02 14:07:31 +01:00
Laurent Destailleur
b55830d205
Fix missing information propagated to trigger
2022-02-02 14:03:09 +01:00
Anthony Berton
da91c5f5ef
Update commonobject.class.php
2022-02-02 12:38:22 +01:00
ksar
0d534f0c37
FIX #19974 : llx_onlinesignature.sql allready exist
...
FIX #19974 : llx_onlinesignature.sql allready exist
2022-02-02 10:56:32 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10
fix sticler
2022-02-01 16:18:02 +01:00
Laurent Destailleur
35ac8923dd
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 16:14:12 +01:00
Laurent Destailleur
1ca1f111b3
Fix warnings
2022-02-01 16:12:51 +01:00
Laurent Destailleur
89a06014da
Fix warnings
2022-02-01 15:55:04 +01:00
habot-it
e0ba321365
Add parent company in action==add of societe card.php
2022-02-01 13:54:25 +00: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
6ddc4ba3a0
Fix bad value for total VAT on PDF
2022-02-01 13:23:52 +01:00
Quentin VIAL-GOUTEYRON
e17d3b029e
FIX delete criteria
2022-02-01 12:24:04 +01:00
Quentin VIAL-GOUTEYRON
e086d5a5f2
NEW Exclude filter
2022-02-01 12:21:06 +01:00
Laurent Destailleur
9db0b7d0ef
Fix look and feel v15
2022-02-01 11:57:33 +01:00
Laurent Destailleur
3b8ece6c0b
Fix php8
2022-01-31 21:46:35 +01:00
mschamp
c83138ec70
Merge branch 'Dolibarr:develop' into develop
2022-01-31 19:55:03 +01:00
Laurent Destailleur
902246e50b
Fix phpcs
2022-01-31 14:05:30 +01:00
Laurent Destailleur
3a40078149
Fix length of list
2022-01-31 14:03:40 +01:00
Laurent Destailleur
f9cb209262
Fix max nb of lines in supplier index page
2022-01-31 12:18:04 +01:00
Laurent Destailleur
d167e022eb
Debug v15
2022-01-31 12:08:51 +01:00
Laurent Destailleur
91be7b279e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 17:28:23 +01:00
Laurent Destailleur
723b9d101a
FIX #yogosha8604
2022-01-30 17:24:10 +01:00
Laurent Destailleur
6a719f6d83
CSS
2022-01-30 16:41:07 +01:00
Laurent Destailleur
a9737a91e7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 16:31:42 +01:00
Laurent Destailleur
87de9a8a23
Fix #yogosha8590
2022-01-30 16:30:19 +01:00
habot-it
93ae62431c
Fix "Warning: This option make TCPDF library being crazy sometime and content on image disappeared!"
2022-01-30 13:09:42 +00:00
Regis Houssin
b2384b624a
FIX regression
2022-01-30 11:40:12 +01:00
Regis Houssin
5f376685c3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function
2022-01-30 11:28:29 +01:00
Laurent Destailleur
7f13561158
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 02:06:08 +01:00
Laurent Destailleur
045cd5e810
Fix phpcs
2022-01-30 02:05:07 +01:00
Laurent Destailleur
b1728a2129
css
2022-01-30 01:58:29 +01:00
Laurent Destailleur
9e86e5ce93
Fix creation of page
2022-01-30 01:46:14 +01:00
Laurent Destailleur
5942bc57e6
Add DDOS protection
2022-01-30 01:03:07 +01:00
Laurent Destailleur
a182cee8b0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-29 16:49:09 +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
87f05067ca
Fix rounding price
2022-01-29 16:47:29 +01:00
Laurent Destailleur
23eda44ba7
Debug v15
2022-01-29 16:43:51 +01:00
Laurent Destailleur
16aa562a13
Debug v15
2022-01-29 16:42:15 +01:00
Laurent Destailleur
728df13238
Optimize files loaded on login and passwordforgotten page
2022-01-29 16:22:55 +01:00
Laurent Destailleur
37fb02ee76
Fix #huntr76f3b405-9f5d-44b1-8434-b52b56ee395f
2022-01-29 15:50:59 +01:00
Laurent Destailleur
d75dd51bb7
Clean code to debug fulldayevent
2022-01-29 00:39:20 +01:00
Laurent Destailleur
266fc808af
Fix trans
2022-01-29 00:15:55 +01:00
Laurent Destailleur
26700f8826
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-29 00:07:18 +01:00
Laurent Destailleur
ffbeda50bd
Better picto for collpase of sub-bom
2022-01-29 00:07:04 +01:00
stickler-ci
a8344d9059
Fixing style errors.
2022-01-28 22:03:08 +00:00
mschamp
a8dd73d007
FIX #19294 implement detailed timespent in task of project API
2022-01-28 22:59:32 +01:00
Laurent Destailleur
d9691e16d5
Merge pull request #18081 from lmag/fix_ticket_substitution
...
fix : #19428 ticket substitution
2022-01-28 20:01:10 +01:00
Laurent Destailleur
38e39cfa96
CSS
2022-01-28 19:57:07 +01:00
Laurent Destailleur
2fa1b01e21
Fix dark theme
2022-01-28 19:51:59 +01:00
Laurent Destailleur
742feed018
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-28 19:30:32 +01:00
Laurent Destailleur
288a6564dc
CSS
2022-01-28 19:28:37 +01:00
Laurent Destailleur
6a5400b1b1
Merge pull request #19919 from Easya-Solutions/new-reassort-list-stock-filter
...
NEW stock filter in reassort lists
2022-01-28 19:10:48 +01:00
Laurent Destailleur
289ce87f6d
Fix fatal error
2022-01-28 19:06:41 +01:00
Laurent Destailleur
d72538506f
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop
...
NEW : Sub-bom
2022-01-28 19:01:30 +01:00
Laurent Destailleur
05ef2c714e
Update supplier_proposal.class.php
2022-01-28 18:54:47 +01:00
Jay Yeo
8c403655a7
FIX supplier_proposal when line update price U.P change 0 modify
2022-01-28 18:54:38 +01:00
Laurent Destailleur
905370ceb1
Merge pull request #19609 from 1ocate/FIX_02_supplier_proposal_update_line
...
FIX supplier_proposal when line update price U.P change 0
2022-01-28 18:53:38 +01:00
Laurent Destailleur
28f4ab4c90
Update supplier_proposal.class.php
2022-01-28 18:52:50 +01:00
Laurent Destailleur
c04a572e0b
Fix doc
2022-01-28 18:46:21 +01:00
Laurent Destailleur
c6a536296e
Merge pull request #19601 from alsoft10/14.0
...
Feature update : #19569
2022-01-28 18:43:25 +01:00
Laurent Destailleur
2b39e381ad
Update api_stockmovements.class.php
2022-01-28 18:14:11 +01:00
andreubisquerra
3ec2769a05
FIX pay value
2022-01-28 18:11:38 +01:00
Laurent Destailleur
b81754ee6e
Merge pull request #19962 from andreubisquerra/develop
...
FIX pay value in TakePOS
2022-01-28 18:11:06 +01:00
Laurent Destailleur
38fd7f9b66
Merge pull request #19947 from aspangaro/14p30
...
FIX Invoice - Clone - Don't report contacts on an another thirdparty
2022-01-28 18:10:28 +01:00
Laurent Destailleur
9dd44c6d5c
Merge pull request #19958 from SylvainLegrand/New_improve_the_reading_of_profIDs
...
New - Improve the reading of profIDs
2022-01-28 18:08:59 +01:00
Laurent Destailleur
adf8f3886b
Merge
2022-01-28 18:07:56 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop
...
NEW #17123 added ExtraFields for Stock Mouvement
2022-01-28 18:04:22 +01:00
Laurent Destailleur
2686541156
Fix late picto
2022-01-28 17:59:58 +01:00
stickler-ci
807ff75b6a
Fixing style errors.
2022-01-28 16:36:15 +00:00
andreubisquerra
9d228b13de
FIX pay value
2022-01-28 17:22:41 +01:00
Laurent Destailleur
d545ba5049
Merge pull request #19948 from OPEN-DSI/fix_vat_report_by_month_and_rate_with_vat_src_code
...
NEW VAT Report by month - Show detail by rate and also by code
2022-01-28 17:21:14 +01:00
Laurent Destailleur
a88d012cb6
Merge pull request #19943 from ptibogxiv/patch-1
...
fix error in commande.class.php
2022-01-28 17:19:20 +01:00
Laurent Destailleur
a20594c2a5
Restore similar values for type than internal methods
2022-01-28 17:18:28 +01:00
Laurent Destailleur
e507fa12fa
Merge pull request #19951 from FHenry/15.0_fix_warning
...
fix:silent warning php Select Lot
2022-01-28 17:08:54 +01:00
Laurent Destailleur
c01e942a1c
Merge pull request #19960 from fappels/15_reception_missing_translation_key
...
Fix missing reception module description translation key.
2022-01-28 17:08:17 +01:00
Laurent Destailleur
32bf4a993d
Merge pull request #19955 from bb2a/patch-1
...
FIX - Holiday trigger
2022-01-28 17:07:59 +01:00
Laurent Destailleur
7333e98fc1
Merge pull request #19957 from bb2a/patch-2
...
FIX - VCard User
2022-01-28 17:07:31 +01:00
Francis Appels
8d75f575e5
Fix missing reception module description translation key.
2022-01-28 16:35:14 +01:00
Laurent Destailleur
7c9b97d035
css
2022-01-28 16:29:27 +01:00
Laurent Destailleur
a631c94193
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-28 15:58:15 +01:00
Laurent Destailleur
ef70777cf1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/reception/card.php
2022-01-28 15:57:09 +01:00
Laurent Destailleur
4b5792899e
FIX Presentation of qty already order duplicated on reception card
2022-01-28 15:51:18 +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
Salvatore Chiariello
e70604c485
NEW|New #17123 added ExtraFields for Stock Mouvement
2022-01-28 14:57:36 +01:00
Laurent Destailleur
bd2d7792f4
css
2022-01-28 13:52:42 +01:00
Laurent Destailleur
da744f5cb9
Fix link
2022-01-28 13:44:15 +01:00
Sylvain Legrand
66b6b5e91a
stickler-ci
2022-01-28 11:31:17 +01:00
Sylvain Legrand
b65f849c5d
New - Improve the reading of profIDs
2022-01-28 11:22:12 +01:00
Laurent Destailleur
34f3ec8a39
Try a fix with php that return a fatal error on some mysql
2022-01-28 11:11:36 +01:00
stickler-ci
adac1d3dbb
Fixing style errors.
2022-01-28 09:34:52 +00:00
Anthony Berton
8c38125e79
Update vcard.php
2022-01-28 10:30:41 +01:00
Laurent Destailleur
5ff37febe3
Trans
2022-01-28 09:58:58 +01:00
Laurent Destailleur
047c55bd02
Fix look and feel v15
2022-01-28 08:49:47 +01:00
stickler-ci
1214ffaf3d
Fixing style errors.
2022-01-28 01:32:44 +00:00
Anthony Berton
28e4cf5553
Update card.php
2022-01-28 02:30:49 +01:00
Anthony Berton
7fb0a78835
Update card.php
2022-01-28 02:30:04 +01:00
Anthony Berton
6fdbda93f8
Update 14.0.0-15.0.0.sql
2022-01-28 02:28:55 +01:00
Anthony Berton
dcb7e39bd2
Update llx_c_action_trigger.sql
2022-01-28 02:27:09 +01:00
Laurent Destailleur
3f9feef914
Comment
2022-01-27 20:38:38 +01:00
Regis Houssin
c25fcf061e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function
2022-01-27 18:01:48 +01:00
Laurent Destailleur
6bd2caee08
test
2022-01-27 16:35:26 +01:00
Regis Houssin
8196134345
FIX not use $this in static function
2022-01-27 14:17:14 +01:00
Regis Houssin
64119917a4
FIX avoid travis error use double quote instead simple quote
2022-01-27 13:35:03 +01:00
Regis Houssin
b07fff5754
FIX Travis avoid error "you should use $this->db-> inside a class file"
2022-01-27 13:06:43 +01:00
Regis Houssin
a1dc6e7e9b
FIX travis error - use double quote instead simple quote
2022-01-27 12:52:13 +01:00
Florian HENRY
4f08409419
fix:waring php
2022-01-27 12:02:58 +01:00
Regis Houssin
b6f9500d46
FIX uniformize code and remove unused global
2022-01-27 12:00:55 +01:00
Laurent Destailleur
2f1857a23a
Log
2022-01-27 11:51:51 +01:00
Laurent Destailleur
b0e5d63ee2
Better log
2022-01-27 11:49:38 +01:00
Regis Houssin
153cd38c78
FIX uniformize and fix code
2022-01-27 10:57:20 +01:00
Regis Houssin
d78bcaa419
FIX avoid stickler Line exceeds 500 characters
2022-01-27 10:26:39 +01:00
Regis Houssin
399fffa81e
FIX convert core class
2022-01-27 10:19:35 +01:00
Regis Houssin
07a47629d1
FIX convert stock class
2022-01-27 10:17:11 +01:00
Regis Houssin
7ff2678ef0
FIX convert inventory class
2022-01-27 10:16:02 +01:00
Regis Houssin
9278c7cb85
FIX convert dynamic_price class
2022-01-27 10:15:08 +01:00
Regis Houssin
116bcd1bdc
FIX convert product class
2022-01-27 10:12:10 +01:00
Regis Houssin
ed9346dfb9
Works on replace MAIN_DB_PREFIX by $db->prefix()
2022-01-27 10:00:26 +01:00
Alexandre SPANGARO
2d0427a5b1
Update tax.lib.php
2022-01-27 06:21:07 +01:00
Alexandre SPANGARO
4693b9702b
Copyright
2022-01-27 06:20:11 +01:00
Alexandre SPANGARO
1ed096316a
Merge branch 'Dolibarr:develop' into fix_vat_report_by_month_and_rate_with_vat_src_code
2022-01-27 06:11:20 +01:00
Alexandre SPANGARO
5f0999665f
FIX Invoice - Clone - Don't report contact on an another thirdparty
2022-01-27 02:27:36 +01:00
stickler-ci
a6bd35c7d8
Fixing style errors.
2022-01-26 22:52:07 +00:00
Cserveny, Tamás
9dda416116
add datem and type parameters
2022-01-26 23:47:07 +01:00
ptibogxiv
928075bbf6
fix error in commande.class.php
2022-01-26 20:13:10 +01:00
Laurent Destailleur
32b2b6e788
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 19:57:00 +01:00
Laurent Destailleur
932096f332
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 19:56:50 +01:00
Laurent Destailleur
538c5f14d3
Fix phpcs
2022-01-26 19:56:02 +01:00
Laurent Destailleur
2e525a719d
Fix selection of migration script
2022-01-26 19:12:02 +01:00
BB2A Anthony Berton
285e1d0f84
ok
2022-01-26 17:25:24 +01:00
BB2A Anthony Berton
be543b3ef9
ok
2022-01-26 17:25:13 +01:00
BB2A Anthony Berton
d0942117df
1
2022-01-26 17:20:12 +01:00
Laurent Destailleur
33d67e74c2
Merge pull request #19934 from bb2a/Add_param_color_button_action
...
NEW - ADD config text color of button action
2022-01-26 16:46:12 +01:00
Adrien Raze
e52fb89182
FIX : Fixing stickler returns
2022-01-26 16:36:58 +01:00
Adrien Raze
d38ff3ad9b
FIX : Fixing stickler returns
2022-01-26 15:53:30 +01:00
kamel
db57d1a99f
Correction lien pour afficher le detail de la tva si la tva est présente coté client en fournisseur
2022-01-26 15:53:03 +01:00
kamel
83d80cc380
Correction recuperation de la vat_rate_show
2022-01-26 15:45:00 +01:00
stickler-ci
9342fa8781
Fixing style errors.
2022-01-26 14:15:53 +00:00
Laurent Destailleur
512df3c580
Try to address a better solution for #19776
2022-01-26 15:12:42 +01:00
Anthony Berton
49efba7ded
Merge branch 'develop' into Add_param_color_button_action
2022-01-26 15:12:16 +01:00
BB2A Anthony Berton
28b9ead688
ADD config text color
2022-01-26 15:06:51 +01:00
Adrien Raze
6d3066a312
FIX : Fixing trads
2022-01-26 14:46:45 +01:00
Laurent Destailleur
4bac7e012f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 14:43:16 +01:00
Laurent Destailleur
9180e9a5c6
Clean code
2022-01-26 14:42:26 +01:00
Adrien Raze
36068d4279
FIX : Fixing total errors
2022-01-26 14:41:36 +01:00
Laurent Destailleur
abc5a93d99
Merge pull request #19827 from defrance/patch-175
...
NEW : use addMoreActionsButtonsList hook in list
2022-01-26 14:19:14 +01:00
Laurent Destailleur
6783ec80be
Try a change on a file to trigger travis
2022-01-26 14:17:32 +01:00
Laurent Destailleur
0d66646052
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 14:08:20 +01:00
Laurent Destailleur
7ce6f13933
Fix php8
2022-01-26 14:07:13 +01:00
Laurent Destailleur
15d4d44cb5
css
2022-01-26 14:01:41 +01:00
Laurent Destailleur
cd1f5fead1
phpcs
2022-01-26 13:51:56 +01:00
Laurent Destailleur
38408f916b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-01-26 13:51:25 +01:00
Laurent Destailleur
6d04bac740
phpcs
2022-01-26 13:50:49 +01:00
Laurent Destailleur
416543a5f5
Standardize code to allow deletion of an odt template
2022-01-26 13:49:46 +01:00
Laurent Destailleur
ae0f428acc
Merge pull request #19923 from bb2a/Add_param_color_button_action
...
NEW - Add param color button action
2022-01-26 13:48:23 +01:00
Laurent Destailleur
f94d84e395
Merge pull request #19655 from cfoellmann/wus/hotfix/fontawesome-PR
...
use any available fontawesome icon in picto
2022-01-26 13:44:38 +01:00
BB2A Anthony Berton
cceb98a195
Correct VAR forget
2022-01-26 13:28:14 +01:00
BB2A Anthony Berton
656dc02e7d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2022-01-26 13:03:01 +01:00
Laurent Destailleur
3b4c7ceb3b
Code comment
2022-01-26 13:00:48 +01:00
Laurent Destailleur
1b50350600
Merge pull request #19910 from atm-adrien/NEW_Add_Hooks_salaries_sociales
...
NEW : Add hooks on salaries and sociales card
2022-01-26 12:58:48 +01:00
Laurent Destailleur
60fff852ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-01-26 12:53:06 +01:00
Laurent Destailleur
9b1b107ed0
Merge pull request #19772 from simnandez/develop_hotfix19760
...
FIX #19760 Uniformize labels
2022-01-26 12:14:57 +01:00
Laurent Destailleur
ab610a90ac
Merge pull request #19924 from atm-quentin/NEW_Multiple_batch_consume
...
NEW : split consumption line on MO
2022-01-26 12:07:41 +01:00
jpb
23e5ff08eb
change to alphawithlgt
2022-01-26 12:07:06 +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
Laurent Destailleur
e2734eca43
Merge pull request #19928 from thomas-Ngr/develop_new_add_header_before_public_ticket_list
...
NEW : add hook before the public ticket list
2022-01-26 12:01:37 +01:00
jpb
ec1f784247
replace restricthtml to nohtml.
2022-01-26 11:43:44 +01:00
Laurent Destailleur
ebdea44de9
Merge pull request #19927 from aspangaro/16a10
...
NEW Proposal - Add filter on proposal get lines
2022-01-26 11:38:25 +01:00
Laurent Destailleur
30fba23326
Merge pull request #19931 from Easya-Solutions/new-stock-add-limit-stock-csv
...
NEW stock limit in stock export CSV
2022-01-26 11:36:53 +01:00
Laurent Destailleur
7b990a1a7f
Fix phpcs
2022-01-26 11:30:19 +01:00
Laurent Destailleur
2dda4f5924
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-01-26 11:29:50 +01:00
Laurent Destailleur
3e1cfc2997
NEW Add status "Obsolete" to KM articles
2022-01-26 11:29:27 +01:00
pandreani
95df5bebe6
NEW stock limit in stock export CSV
2022-01-26 10:35:08 +01:00
Thomas Negre
ec723657c9
new : allow informations to be displayed before the public ticket list
2022-01-26 09:55:41 +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
Anthony Berton
4f54149555
Update commonobject.class.php
2022-01-25 22:28:47 +01:00
BB2A Anthony Berton
54b5fed67b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2022-01-25 16:45:30 +01:00
Adrien Raze
08d830f450
FIX : Fixing total_cost, qty_frozen and display problems
2022-01-25 16:40:28 +01:00
Quentin VIAL-GOUTEYRON
4de5ee97b3
NEW : split consumption line on MO
2022-01-25 16:37:33 +01:00
Juanjo Menent
56cb81287e
Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760
...
# Conflicts:
# htdocs/install/mysql/migration/15.0.0-16.0.0.sql
2022-01-25 16:25:44 +01:00
Laurent Destailleur
a7d3facf88
Fix tooltip for payment
2022-01-25 16:10:46 +01:00
Thomas Negre
311d6d666d
fix ticket : an external user should be able to access only its own company tickets.
2022-01-25 16:07:56 +01:00
Laurent Destailleur
58fcf88e24
Merge pull request #19922 from thomas-Ngr/develop_fix_restrict_external_user_ticket_list
...
fix : restrict external user ticket list view
2022-01-25 16:07:18 +01:00
Laurent Destailleur
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list
...
NEW : Contact filter project list
2022-01-25 16:06:31 +01:00
Laurent Destailleur
34e930d952
Merge pull request #19737 from aspangaro/16a6
...
NEW Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
2022-01-25 16:04:11 +01:00
Laurent Destailleur
05ff99f2e6
Update user.class.php
2022-01-25 16:03:30 +01:00
Laurent Destailleur
6677eccf45
Update user.class.php
2022-01-25 16:01:50 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab
2022-01-25 15:58:54 +01:00
Laurent Destailleur
13f66df975
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-25 15:43:57 +01:00
Laurent Destailleur
c3a58ae303
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-25 15:43:42 +01:00
Thomas Negre
0126be54a3
fix ticket : an external user should be able to access only its own company tickets.
2022-01-25 15:19:40 +01:00
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup
...
NEW : convert situation setup to new setup system
2022-01-25 15:17:14 +01:00
Quentin VIAL-GOUTEYRON
8cf1991d64
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Multiple_batch_consume
2022-01-25 15:08:03 +01:00
Laurent Destailleur
5d176c75db
Merge pull request #19780 from aspangaro/16a7
...
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
2022-01-25 15:00:47 +01:00
Laurent Destailleur
bb49dd195e
Merge pull request #19722 from bjoern86/patch-2
...
Adds possibility to add senders name to $formmail->fromname
2022-01-25 14:58:27 +01:00
Laurent Destailleur
b7b88865e6
Update card_presend.tpl.php
2022-01-25 14:58:00 +01:00
Laurent Destailleur
30811e9b1a
Merge branch 'develop' into NEW_Add_Hooks_salaries_sociales
2022-01-25 14:45:51 +01:00
Laurent Destailleur
0d54f8df5f
Merge pull request #19847 from andreubisquerra/develop
...
Create new line when add ordered product in TakePOS
2022-01-25 14:29:07 +01:00
Laurent Destailleur
80e2c1c449
Merge pull request #19857 from cfoellmann/PR/tasks-fetch_optionals
...
getTasksArray() fetch_optionals to populate ExtraFields
2022-01-25 14:28:16 +01:00
Laurent Destailleur
37338f9a60
Update card.php
2022-01-25 14:03:29 +01:00
Laurent Destailleur
4b00ddb0b5
Merge pull request #19866 from atm-gauthier/FIX_hrm_divers
...
FIX : rankorder + vacant positions
2022-01-25 14:02:44 +01:00
Laurent Destailleur
037a01aa79
Merge pull request #19918 from Je2fb/patch-3
...
Add new expression in Dynamic Price
2022-01-25 13:55:57 +01:00
Thomas Negre
bab35fd97d
Fix ticket module : security check would prevent automatic fill of thirdparty fields when creating a ticket from thirdparty card.
2022-01-25 13:42:03 +01:00
Laurent Destailleur
54e5b5d369
Fix reponsive
2022-01-25 13:40:22 +01:00
Laurent Destailleur
8f0d42c378
Merge pull request #19920 from thomas-Ngr/develop_fix_ticket_remove_null_socid
...
Fix ticket module : security check breaks automatic.
2022-01-25 13:40:01 +01:00
Thomas Negre
76b0dee58a
Fix ticket module : security check would prevent automatic fill of thirdparty fields when creating a ticket from thirdparty card.
2022-01-25 12:20:12 +01:00
Adrien Raze
f37c04bc2f
NEW : Add the possibility to add sub-BOMs to BOM
2022-01-25 12:06:40 +01:00
Adrien Raze
a5903abb5b
FIX : Change display of the bom's select
2022-01-25 11:28:36 +01:00
Adrien Raze
4edbd5c4e3
NEW : Creation of the function select_bom() used to display bom select list
2022-01-25 10:31:45 +01:00
lvessiller
2b5bc29d1b
NEW stock filter in reassort lists
2022-01-25 10:00:33 +01:00
Christian Foellmann
15346d1c4a
getTasksArray() fetch_optionals to populate ExtraFields
2022-01-25 09:17:30 +01:00
stickler-ci
d1dd70f9cc
Fixing style errors.
2022-01-25 08:10:58 +00:00
Je2fb
a1f676eb8c
Add new expression in Dynamic Price
...
Add the expression supplier_min_price_with_discount for select the buy price.
2022-01-25 09:07:53 +01:00
Anthony Berton
13dbadf770
Update 15.0.0-16.0.0.sql
2022-01-25 00:19:41 +01:00
Anthony Berton
1d265d801a
Update 14.0.0-15.0.0.sql
2022-01-25 00:19:09 +01:00
Anthony Berton
1bd86e4bae
Update 14.0.0-15.0.0.sql
2022-01-25 00:11:04 +01:00
Anthony Berton
b64856807b
Update llx_c_action_trigger.sql
2022-01-25 00:09:41 +01:00
Laurent Destailleur
66287d645e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 23:59:02 +01:00
Laurent Destailleur
19dcc95d6f
Fix tooltip for payment
2022-01-24 23:58:31 +01:00
Laurent Destailleur
9f377b7fe4
Better responsive on small screen
2022-01-24 23:58:16 +01:00
Laurent Destailleur
d560483875
Fix permission from group not found
2022-01-24 18:32:29 +01:00
Laurent Destailleur
bb11ab992b
Trans
2022-01-24 17:50:35 +01:00
kamel
7ca333f4d7
Fix the vat report by month and rate (with also the vat src code)
2022-01-24 17:04:46 +01:00
Laurent Destailleur
0e8b7ef656
Clean code
2022-01-24 16:38:25 +01:00
stickler-ci
6cb97b1346
Fixing style errors.
2022-01-24 15:13:40 +00:00
Adrien Raze
c131bdcbd3
NEW : Add hooks on salaries and sociales card
2022-01-24 16:06:02 +01:00
Atm-Gregr
99fb082403
prevent access denied page
2022-01-24 14:50:54 +01:00
Laurent Destailleur
be01e3b1ac
Migration
2022-01-24 14:48:18 +01:00
Laurent Destailleur
38dbaa3d07
Doc
2022-01-24 14:12:27 +01:00
Laurent Destailleur
8dbadc0aa8
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 14:12:06 +01:00
Laurent Destailleur
6b5c0769b8
FIX #19786
2022-01-24 14:09:53 +01:00
Laurent Destailleur
1eb4d76253
Clean code
2022-01-24 13:15:32 +01:00
Laurent Destailleur
0e5907e220
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 12:50:35 +01:00
Laurent Destailleur
8ceec043e8
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 12:50:10 +01:00
Laurent Destailleur
00eabded6d
Fix phpunit
2022-01-24 12:43:42 +01:00
Laurent Destailleur
4d2832e8a0
Merge pull request #19764 from FHenry/dev_BDD_19763
...
NEW: #19763 DB change only - Can invoice task time per different services
2022-01-24 12:28:11 +01:00
Laurent Destailleur
69cd6f0a25
Remove hardcodes list of migration files
2022-01-23 23:37:59 +01:00
Laurent Destailleur
0a996f44be
Merge pull request #19819 from OPEN-DSI/new-invoice-propagate-extrafields-on-credit-note
...
NEW pre-filled extra fields with slected credit note
2022-01-23 20:58:45 +01:00
stickler-ci
bc37e75e7f
Fixing style errors.
2022-01-23 18:49:28 +00:00
Laurent Destailleur
7a8d0b698a
Merge branch 'develop' into packbuyprice
2022-01-23 19:46:26 +01:00
Laurent Destailleur
dee020f286
Update getSupplierPrices.php
2022-01-23 19:40:23 +01:00
Laurent Destailleur
d41f3f1797
Merge pull request #19832 from aspangaro/15a14
...
NEW Create contract from invoice
2022-01-23 19:29:09 +01:00
Laurent Destailleur
45ffd68e92
Simplify code
2022-01-23 19:26:29 +01:00
Laurent Destailleur
053b402202
Fix for notes standardization #19835
2022-01-23 19:20:13 +01:00
Laurent Destailleur
2985c03f9f
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-23 18:53:50 +01:00
Laurent Destailleur
daca510fa6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
build/docker/docker-compose.yml
2022-01-23 18:52:47 +01:00
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test
...
FIX : lang load in validate class and fix test for numeric values
2022-01-23 18:24:11 +01:00
Laurent Destailleur
78c7ed5b9f
Merge pull request #19839 from dolibit-ut/patch-368
...
Update card.php
2022-01-23 18:21:32 +01:00
Laurent Destailleur
67fa80cf18
Merge pull request #19841 from fappels/15_fix_dolibarr_export
...
Fix view after generate database export
2022-01-23 18:20:36 +01:00
Laurent Destailleur
909c974bad
Merge pull request #19897 from smil2k/bug/19896
...
fix docker build setup
2022-01-23 17:53:44 +01:00
BB2A Anthony Berton
0552381e39
1
2022-01-23 16:36:47 +01:00
Laurent Destailleur
acafc69baa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-01-23 16:13:20 +01:00
Laurent Destailleur
07ef603c2c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-01-23 16:12:37 +01:00
Laurent Destailleur
251609eb26
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-01-23 16:12:27 +01:00
Laurent Destailleur
e392d98beb
Fix hook
2022-01-23 13:43:48 +01:00
Laurent Destailleur
51521f2ff9
Merge branch 'develop' into patch-3
2022-01-23 13:42:05 +01:00
Laurent Destailleur
20ac994d0d
Update emailcollector.class.php
2022-01-23 13:41:26 +01:00
Laurent Destailleur
e2a1662027
Merge pull request #19844 from nervo/patch-2
...
NEW: Add "addMoreActionsButtons" hook to subscription form
2022-01-23 13:08:58 +01:00
Laurent Destailleur
74a74829d3
Merge pull request #19851 from ptibogxiv/patch-460
...
NEW support user_modif in order
2022-01-23 13:06:55 +01:00
Laurent Destailleur
3f33f20fb1
Merge pull request #19840 from dolibit-ut/patch-369
...
add CANCEL Button
2022-01-23 13:06:23 +01:00
Laurent Destailleur
8b826949f5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-23 13:04:48 +01:00
Laurent Destailleur
0ee0bfed85
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/fourn/commande/card.php
test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
8dc9489c31
Merge pull request #19880 from atm-lena/14.0_FIX_CreateEventFromContract
...
14.0 fix create event from contract
2022-01-23 12:55:59 +01:00
Laurent Destailleur
6c78ba5c71
Merge pull request #19884 from smil2k/bug/17058
...
Check if the lines in create is type object (like supplier invoice)
2022-01-23 12:54:17 +01:00
Laurent Destailleur
698e7f4b54
Merge pull request #19889 from Hystepik/develop_v15#1
...
Fix : remove false positive on carriage return on inventory scan
2022-01-23 12:35:54 +01:00
Laurent Destailleur
ba404493a2
Merge pull request #19865 from hregis/fix_avoid_warning
...
FIX avoid warning
2022-01-23 12:33:52 +01:00
Laurent Destailleur
9dd3d970bf
Update commonobject.class.php
2022-01-23 12:31:30 +01:00
Laurent Destailleur
92b198d564
Merge pull request #19893 from atm-kevin/NEW_Stock_Columns_On_BOM
...
NEW : Display physical and virtual stock of the products when creating OF from a BOM
2022-01-23 12:29:26 +01:00
Laurent Destailleur
5abe6c0eb5
Merge pull request #19878 from bb2a/patch-1
...
NEW - Add substitutions "user numbers"
2022-01-23 12:23:28 +01:00
Laurent Destailleur
3bea78726a
Merge pull request #19888 from bb2a/patch-2
...
Update formated substitution
2022-01-23 12:22:32 +01:00
Philippe GRAND
fefbaa739a
fix : bad path
2022-01-23 12:21:15 +01:00
Laurent Destailleur
9924333df8
Merge pull request #19883 from grandoc/new_branch_19_01_2022
...
fix : bad path
2022-01-23 12:20:40 +01:00
Laurent Destailleur
ef0a08ad1c
Merge pull request #19570 from Easya-Solutions/12.0
...
FIX: Update swiftmailer librairies
2022-01-23 12:15:43 +01:00
Laurent Destailleur
9be8c0b474
Merge pull request #19885 from alsoft10/develop
...
PR REQUEST #19679
2022-01-23 12:12:53 +01:00
Laurent Destailleur
dfcaeea9d1
Merge pull request #19900 from thomas-Ngr/develop_new_ticket_check_notify_tier_at_create
...
NEW option to default check "notify tier at creation" in ticket module
2022-01-23 12:11:10 +01:00
Laurent Destailleur
255ac69a0d
Update card.php
2022-01-23 12:10:52 +01:00
Laurent Destailleur
9424cebf0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-23 12:07:19 +01:00
Laurent Destailleur
9049134556
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-23 12:07:11 +01:00
Laurent Destailleur
a16d47c78e
Close #19890
2022-01-23 12:06:40 +01:00
Laurent Destailleur
0e75d024a6
Merge pull request #19901 from thomas-Ngr/develop_new_auto_read_ticket
...
NEW allow a ticket to be automatically marked as read
2022-01-23 12:05:24 +01:00
Cserveny, Tamás
ca588852df
fix code review errors
2022-01-23 12:00:33 +01:00
stickler-ci
bd6fdbd3be
Fixing style errors.
2022-01-23 12:00:24 +01:00
Cserveny, Tamás
93edbf1cda
missing supplierorder api
2022-01-23 12:00:16 +01:00
Laurent Destailleur
8f6f1c93aa
Merge pull request #19898 from smil2k/feature/18411
...
Missing supplierorder api
2022-01-23 11:59:08 +01:00
Laurent Destailleur
4981f418e8
Merge pull request #19899 from atm-jpb/fix_15.0_modelMailWidth
...
FIX : 15.0 add minwidth to selectArray mail model
2022-01-23 11:58:09 +01:00
Laurent Destailleur
66d7271c94
Merge pull request #19904 from hregis/fix_use_new_function_prefix
...
NEW add modifications for new function "$db->prefix()"
2022-01-23 11:57:42 +01:00
Laurent Destailleur
e06ca2ea08
css
2022-01-23 02:38:34 +01:00
Laurent Destailleur
0c8cdad1e9
css
2022-01-23 02:22:12 +01:00
Laurent Destailleur
e3cf5fecbe
css
2022-01-23 02:06:47 +01:00
Florian HENRY
3063006d61
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763
2022-01-22 18:12:32 +01:00
Laurent Destailleur
a16293f9b7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-22 17:27:57 +01:00
Laurent Destailleur
2f1805beb8
Fix #yogosha8532
2022-01-22 17:14:45 +01:00
Laurent Destailleur
e0956c1765
Fix missing token, missing reposition, missing modulepart
2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143
NEW Can removed doc templates from setup page of thirdparty
2022-01-22 15:09:14 +01:00
Laurent Destailleur
caf7e7d7d5
FIX action must be protected with a permission check
2022-01-22 15:07:53 +01:00
Laurent Destailleur
1790ba2820
NEW Can removed doc templates from setup page of thirdparty
2022-01-22 15:06:05 +01:00
Laurent Destailleur
4750f6bbc6
FIX action must be protected with a permission check
2022-01-22 15:05:41 +01:00
Laurent Destailleur
6baa0939ce
NEW Can add a tooltip after the combo list of doc templates
2022-01-22 14:03:39 +01:00
Laurent Destailleur
284fcf3ad5
FIX Company logo not found in some cases on some templates
2022-01-22 13:19:29 +01:00
Laurent Destailleur
65e58943b3
FIX exclude the pdf png preview files from backup
2022-01-21 20:57:45 +01:00
Laurent Destailleur
38fcfd38f8
Fix trans
2022-01-21 19:16:29 +01:00
Florian HENRY
e0048c056a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763
2022-01-21 19:01:42 +01:00
Regis Houssin
a3a856d0be
NEW add modifications for new function "$db->prefix()"
2022-01-21 16:57:57 +01:00
Laurent Destailleur
82305d7dd4
Fix bad position sorting of permission list
2022-01-21 16:34:09 +01:00
Laurent Destailleur
4ac62773ae
Fix permissions on deletion on time spend line
2022-01-21 16:22:59 +01:00
Laurent Destailleur
8c22de6982
Comment
2022-01-21 16:15:38 +01:00
Laurent Destailleur
bbb0864fd8
Look and feel v15
2022-01-21 15:45:09 +01:00
Laurent Destailleur
482efec536
Fix missing column
2022-01-21 15:40:37 +01:00
Quentin VIAL-GOUTEYRON
84d446cf73
NEW possibility to consume multiple batch
2022-01-21 15:31:30 +01:00
Laurent Destailleur
accc413596
Fix error management
2022-01-21 15:26:54 +01:00
Laurent Destailleur
20cc2c924e
css
2022-01-21 14:02:26 +01:00
Juanjo Menent
18e308e800
remove leftover if
2022-01-21 13:47:20 +01:00
Laurent Destailleur
1dcfb88ad4
Debug v15
2022-01-21 13:44:40 +01:00
Juanjo Menent
59921d60b3
Length label control
2022-01-21 13:38:59 +01:00
Juanjo Menent
0fb9e9c988
Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760
...
# Conflicts:
# htdocs/install/mysql/migration/15.0.0-16.0.0.sql
2022-01-21 12:42:51 +01:00
Thomas Negre
e9526654fe
NEW allow a ticket to be automatically marked as read when created from backend.
...
Introduces option TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND
2022-01-21 11:35:18 +01:00
Alexandre SPANGARO
573d45fec8
Merge remote-tracking branch 'upstream/develop' into 15a14
2022-01-21 10:47:27 +01:00
stickler-ci
3e84a99965
Fixing style errors.
2022-01-21 08:58:06 +00:00
jpb
15c39db35c
add minwidth to selectArray
2022-01-21 09:55:14 +01:00
jpb
015cd543d6
add minwidth to selectArray
2022-01-21 09:52:52 +01:00
Thomas Negre
bb86be062c
NEW ticket module : add an option to enable default check notify tier at creation
...
introduces new option TICKET_CHECK_NOTIFY_TIER_AT_CREATE
2022-01-21 09:44:22 +01:00
Cserveny, Tamás
c6ac4d63a5
fix code review errors
2022-01-20 22:28:07 +01:00
stickler-ci
c5136240b4
Fixing style errors.
2022-01-20 21:25:35 +00:00
Cserveny, Tamás
a322f113bf
missing supplierorder api
2022-01-20 22:20:49 +01:00
Laurent Destailleur
9276224422
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-20 21:49:33 +01:00
Laurent Destailleur
beee7fc5d3
Fix #yogosha8484
2022-01-20 20:03:58 +01:00
ptibogxiv
b89947ff7c
Update commande.class.php
2022-01-20 19:58:31 +01:00
ptibogxiv
56dd41324c
Update commande.class.php
2022-01-20 19:57:48 +01:00
Laurent Destailleur
050b531403
Fix troubles in select_language when selected is array
2022-01-20 19:01:04 +01:00
Laurent Destailleur
d9b0af616e
Fix the localtax were not saved on price when no code was set
2022-01-20 18:51:14 +01:00
Laurent Destailleur
8c3b28b0d0
Introduce method for future
2022-01-20 18:50:18 +01:00
Laurent Destailleur
b2f6de06d5
Fix the localtax were not saved on price when no code was set
2022-01-20 18:09:30 +01:00
Cserveny, Tamás
259c94e320
fix docker build setup
2022-01-20 17:57:21 +01:00
Laurent Destailleur
de30b68f9e
Code comment
2022-01-20 17:10:30 +01:00
stickler-ci
238e2111f0
Fixing style errors.
2022-01-20 16:07:18 +00:00
BENKE Charlene
82b14caa13
FIX if we have PRODUCT_USE_UNITS, task fail
...
we need public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
2022-01-20 17:06:03 +01:00
kevin
553dc5a1ef
Display the physical and virtual stock of the products when creating OF from a BOM
2022-01-20 16:59:05 +01:00
lmarcouiller
03af9ea3f3
remove false positive on carriage return
2022-01-20 14:54:54 +01:00
Anthony Berton
687c8e2082
Update functions.lib.php
2022-01-20 13:49:23 +01:00
Anthony Berton
871e707185
Update functions.lib.php
2022-01-20 13:45:51 +01:00
stickler-ci
0bb697c3ae
Fixing style errors.
2022-01-20 06:47:57 +00:00
alsoft10
e212395f00
PR REQUEST #19679
2022-01-20 12:12:59 +05:30
stickler-ci
400d28238c
Fixing style errors.
2022-01-20 00:09:52 +00:00
Cserveny, Tamás
115f022ae9
Check if the lines in create is type object (like supplier invoice)
2022-01-20 00:55:52 +01:00
Laurent Destailleur
a5de93cf44
Validate the oauthstateanticsrf value.
2022-01-19 23:03:24 +01:00
Laurent Destailleur
3ae63cb111
Clean code
2022-01-19 22:49:53 +01:00
Laurent Destailleur
b09cb42e25
Decode extra params of id_token
2022-01-19 22:26:31 +01:00
Philippe GRAND
13329aab2e
fix : bad path
2022-01-19 21:18:49 +01:00
Laurent Destailleur
ee836305ba
Fix state field
2022-01-19 20:51:53 +01:00
Laurent Destailleur
d38784f45a
WIP Login with Google
2022-01-19 20:33:20 +01:00
Laurent Destailleur
ff1037634b
Clean OAuth feature
2022-01-19 18:23:31 +01:00
Laurent Destailleur
4f533c3f9d
Merge
2022-01-19 16:54:00 +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
db903ad64d
Fix #yogosha8457
2022-01-19 16:40:48 +01:00
atm-lena
db9a26f8d4
FIX error urlencode
2022-01-19 15:35:09 +01:00
atm-lena
c8589970af
FIX : event created from contract not linked to object origin
2022-01-19 15:33:30 +01:00
Laurent Destailleur
60b90056c4
Fix #yogosha8450
2022-01-19 15:20:10 +01:00
Laurent Destailleur
ed2ca6af79
CSS
2022-01-19 14:32:15 +01:00
Florian HENRY
aa2b244bf3
fix wordpress indent
2022-01-19 13:31:51 +01:00
Florian HENRY
8141e3e460
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763
2022-01-19 13:30:39 +01:00
Anthony Berton
5f4c53f824
Update functions.lib.php
2022-01-19 11:37:38 +01:00
Anthony Berton
0a99e7c82a
Update functions.lib.php
2022-01-19 10:51:31 +01:00
Laurent Destailleur
49f0e2f765
Merge pull request #19521 from altairis-melina/displaysku
...
NEW : Show product reference in Takepos
2022-01-19 02:32:51 +01:00
Laurent Destailleur
eb3bce9759
Merge pull request #19527 from altairis-melina/nocategory
...
NEW : Add constant to hide categories in TakePos
2022-01-19 02:30:52 +01:00
Laurent Destailleur
6179d7a4e6
Merge pull request #19618 from altairis-melina/hookproduct
...
Add Hooks for takepos ajax search
2022-01-19 02:30:09 +01:00
Laurent Destailleur
659372aa9e
Merge pull request #19645 from FHenry/dev_addOAuthWordPress
...
NEW: add WordPress OAuth
2022-01-19 02:26:54 +01:00
Laurent Destailleur
63d6ef1ba0
Merge pull request #19647 from OPEN-DSI/new-exports-entity-filters
...
NEW add entity filter in exports
2022-01-19 02:26:18 +01:00
Laurent Destailleur
3310f3ffa5
Merge pull request #19758 from FHenry/new_product_ref_for_bom
...
NEW: Display product ref in "Object link" product tab for BOM
2022-01-19 02:12:06 +01:00
Laurent Destailleur
595bfa3f7b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 02:03:00 +01:00
Laurent Destailleur
c2c74f4849
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 02:02:52 +01:00
Laurent Destailleur
fc7e8ed720
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-19 02:02:03 +01:00
Laurent Destailleur
c469634101
Fix hook for emailcollector
2022-01-19 02:01:52 +01:00
Laurent Destailleur
499dd859ee
Merge pull request #19853 from atm-maxime/new_hook_main_area
...
New hook printMainArea
2022-01-19 01:57:39 +01:00
Laurent Destailleur
b88da24ba4
Merge pull request #19850 from ptibogxiv/patch-459
...
Fix stripe SetupIntent
2022-01-19 01:49:53 +01:00
Laurent Destailleur
7bc0f44e7c
Merge pull request #19870 from fappels/15_fix_dispatchProduct
...
FIX: origin missing for supplier order dispatchProduct
2022-01-19 01:07:05 +01:00
Laurent Destailleur
ede465e78e
Merge pull request #19871 from OPEN-DSI/new-const-search-cat-or-default
...
NEW MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
2022-01-19 01:06:32 +01:00
Laurent Destailleur
0f03f5c57f
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-18 20:15:23 +01:00
Anthony Berton
f093e01cec
Update 14.0.0-15.0.0.sql
2022-01-18 19:34:18 +01:00
Anthony Berton
16ca2d68b6
Update llx_c_action_trigger.sql
2022-01-18 19:31:51 +01:00
Laurent Destailleur
3eff894da1
Fix css
2022-01-18 19:27:06 +01:00
Laurent Destailleur
f2760cded6
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-18 19:22:43 +01:00
Laurent Destailleur
b3a8b56625
Fix typo
2022-01-18 19:01:51 +01:00
Laurent Destailleur
178f7b0ace
CSS
2022-01-18 18:59:03 +01:00
lvessiller
6a9c9cc81a
NEW MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
2022-01-18 16:36:50 +01:00
Laurent Destailleur
22a3b5ea78
FIX deletion of supplier order when draft
2022-01-18 16:24:28 +01:00
Francis Appels
d4adeba1fc
FIX: origin missing for supplier order dispatchProduct
2022-01-18 16:22:41 +01:00
Laurent Destailleur
3757d7e952
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2022-01-18 16:11:48 +01:00
Laurent Destailleur
200f796232
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-18 16:08:54 +01:00
Laurent Destailleur
75eb256589
Fix perm to delete a draft supplier order
2022-01-18 16:06:27 +01:00
Laurent Destailleur
01aa2deae6
Fix bad include
2022-01-18 15:27:43 +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
6276bb77ad
Prepare v16
2022-01-18 13:17:59 +01:00
Laurent Destailleur
09eb051bcc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-18 12:25:20 +01:00
Laurent Destailleur
874bbca881
Doc
2022-01-18 12:24:19 +01:00
Laurent Destailleur
f91504b9c1
Add property
2022-01-18 12:16:13 +01:00
Gauthier PC portable 024
255d8ba753
FIX : rankorder + vacant positions
2022-01-18 10:59:10 +01:00
Regis Houssin
08009bcec5
FIX avoid warning
2022-01-18 10:06:11 +01:00
Laurent Destailleur
b5de132343
Fix responsive
2022-01-18 00:22:25 +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
642f77e8f5
FIX Widget of stock alert does not report on purchase products.
2022-01-17 22:07:18 +01:00
Laurent Destailleur
2f7832ee44
css
2022-01-17 19:18:48 +01:00
Laurent Destailleur
812f12ccc4
Fix tz message
2022-01-17 19:09:18 +01:00
Laurent Destailleur
a072c8911a
Fix tz of message on popup
2022-01-17 19:07:02 +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
2462700975
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 13:57:59 +01:00
Laurent Destailleur
7034ddf063
Freemono instead of freeserif
2022-01-17 13:56:32 +01:00
Laurent Destailleur
22ab3c03a1
Fix another way to write the preg_replace_callback
2022-01-17 09:12:09 +01:00
Laurent Destailleur
cfc39ebf0a
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-17 08:59:34 +01:00
Laurent Destailleur
5fd2d00936
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 08:57:48 +01:00
Maxime Kohlhaas
8eeb0caa78
New hook printMainArea
2022-01-16 21:10:02 +01:00
Laurent Destailleur
24de82859e
Debug v15
2022-01-16 20:22:09 +01:00
Laurent Destailleur
372b583e50
Debug template of warehouse
2022-01-16 19:21:59 +01:00
Laurent Destailleur
6826b373fd
css
2022-01-16 13:22:21 +01:00
Laurent Destailleur
3aedf6434b
css
2022-01-16 13:11:12 +01:00
Laurent Destailleur
cdbcad9c4f
Sync transifex
2022-01-16 12:51:08 +01:00
ptibogxiv
accb0deb29
New support user_modif in order
2022-01-16 00:13:14 +01:00
ptibogxiv
1ce7d3ad8b
Fix stripe SetupIntent
...
Klarna not possible for SetupIntent
2022-01-15 23:26:46 +01:00
Maxime Kohlhaas
ea55712d1b
Fix missing require class project
2022-01-15 23:04:56 +01:00
stickler-ci
45666e7f0a
Fixing style errors.
2022-01-15 21:45:20 +00:00
Randall Mora
65e77d7795
Update emailcollector.class.php
...
Enable to init hook to emailcollectorcard, when docollect is executed by cron task.
2022-01-15 15:37:31 -06:00
andreubisquerra
9cd4bfabff
Create new line when add ordered product in TakePOS
...
When TAKEPOS_GROUP_SAME_PRODUCT is enabled in TakePOS and you add product, avoid group it if product is ordered
2022-01-15 21:53:49 +01:00
Laurent Destailleur
63df7ba0d4
Clean code
2022-01-15 21:10:33 +01:00
Laurent Destailleur
8e4c7efed5
Fix do not include file if url not correctly detected
2022-01-15 20:53:16 +01:00
Laurent Destailleur
5070a40fa4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/list.php
2022-01-15 20:28:04 +01:00
nervo
26c54373e8
Add "addMoreActionsButtons" hook to subscription form
2022-01-15 19:06:07 +01:00
Laurent Destailleur
2b19bcef54
Fix responsive
2022-01-15 13:08:15 +01:00
Laurent Destailleur
8cb5264928
Fix css
2022-01-15 12:56:19 +01:00
Florian HENRY
64f6a54320
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_product_ref_for_bom
2022-01-15 12:51:36 +01:00
Laurent Destailleur
b3b1e82100
Change on column Assigned to on projet and task.
2022-01-15 12:30:41 +01:00
Laurent Destailleur
fe79218571
Change on column Assigned to on projet and task.
2022-01-15 12:26:08 +01:00
Francis Appels
89869a2485
Fix view after generate export
2022-01-15 12:09:36 +01:00
Laurent Destailleur
ecde594a15
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/card.php
2022-01-14 20:28:44 +01:00
Laurent Destailleur
6acf59fe20
Fix responsive
2022-01-14 20:26:56 +01:00
Laurent Destailleur
22ef83ab67
Fix responsive
2022-01-14 20:05:43 +01:00
Laurent Destailleur
8c165aced2
Fix responsive
2022-01-14 20:05:39 +01:00
UT from dolibit
56ef9d3d51
add CANCEL Button
...
add CANCEL Button
& add more space for small Touchscreens
2022-01-14 18:44:49 +01:00
stickler-ci
41f00a8aef
Fixing style errors.
2022-01-14 17:25:59 +00:00
UT from dolibit
23a9c43d39
Update card.php
2022-01-14 18:23:23 +01:00
Laurent Destailleur
3d98d62889
Prepare v16
2022-01-14 18:14:05 +01:00
Laurent Destailleur
57692ba556
Fix responsive
2022-01-14 17:51:19 +01:00
Laurent Destailleur
35a1b06c44
Fix responsive
2022-01-14 17:48:15 +01:00
Laurent Destailleur
3d97888bc5
Comment
2022-01-14 17:46:06 +01:00
lvessiller
a9c76f2e44
FIX replace print error with event message when error on update line in supplier order
2022-01-14 16:09:30 +01:00
Laurent Destailleur
4200f2f195
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-14 14:02:30 +01:00
Laurent Destailleur
77c286b769
Fix permission
2022-01-14 14:01:50 +01:00
Laurent Destailleur
744296a43a
FIX Permission on holiday and expensereport.
2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7
FIX Pb with permission on holiday and expense report
2022-01-14 13:42:38 +01:00
ATM john
a394713f1b
Fix doc comment
2022-01-14 11:51:07 +01:00
ATM john
8ace96f495
Fix validate class lang load and test for numeric values
2022-01-14 11:46:31 +01:00
Laurent Destailleur
02fc420c2a
FIX #19817
2022-01-14 11:37:13 +01:00
Laurent Destailleur
1ae01ba2fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-14 10:38:38 +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
e223fb1e7c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-01-14 10:36:56 +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
Laurent Destailleur
490f17d5a2
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-14 10:24:00 +01:00
Laurent Destailleur
62ae0361f7
Merge pull request #19818 from DATUC/patch-24
...
Update companies.lang
2022-01-14 10:19:48 +01:00
Laurent Destailleur
5b6133ad62
Merge pull request #19821 from marc-dll/12.0_FIX_shipment_all_lines
...
FIX: order to shipment: debug hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS
2022-01-14 10:19:28 +01:00
Laurent Destailleur
256b4fb06b
Merge pull request #19834 from dolibarr95/patch-59
...
Update extrafields.class.php
2022-01-14 10:16:32 +01:00
Laurent Destailleur
5881e36ba6
Code comment
2022-01-14 10:15:46 +01:00
stickler-ci
2b64f69def
Fixing style errors.
2022-01-14 09:12:30 +00:00
dolibarr95
5b3fcc5e43
Update extrafields.class.php
2022-01-14 10:10:10 +01:00
Laurent Destailleur
e365975b2f
Merge pull request #19820 from frederic34/patch-1
...
fix warning
2022-01-14 10:04:42 +01:00
Laurent Destailleur
7d5c36ad02
Merge pull request #19823 from harrywinner/15.0
...
FIX Solving non-blocking bug in user login
2022-01-14 10:03:10 +01:00
Laurent Destailleur
71e470eb6c
Merge pull request #19826 from atm-gauthier/FIX_hrm
...
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-14 10:01:14 +01:00
Laurent Destailleur
b7aa152464
Fix trans
2022-01-14 09:55:13 +01:00
dolibarr95
e53d9d4320
Update extrafields.class.php
...
fix #19739
2022-01-14 08:52:04 +01:00
Alexandre SPANGARO
22e4ea63ea
Merge remote-tracking branch 'upstream/develop' into 15a14
2022-01-13 22:30:05 +01:00
Alexandre SPANGARO
6d1f5e1ef1
NEW Add possibility to create contract from invoice
2022-01-13 22:29:48 +01:00
Laurent Destailleur
f51554fd4d
Fix missing token
2022-01-13 20:40:42 +01:00
Laurent Destailleur
cb45f79ab0
Fix scrutinizer
2022-01-13 20:16:12 +01:00
Laurent Destailleur
fccddd7805
Fix property missing
2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a
Fix missing var
2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889
FIX Debug level 3 of accounting account was using wront field
2022-01-13 19:49:38 +01:00
Laurent Destailleur
240958ace6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-13 19:21:28 +01:00
Laurent Destailleur
dbc2631d6a
Fix scrutinizer warnings
2022-01-13 19:19:36 +01:00
Laurent Destailleur
b6dc7a3f19
Doc
2022-01-13 19:09:34 +01:00
Laurent Destailleur
7ccb1c94a1
Fix var not defined
2022-01-13 19:07:05 +01:00
Laurent Destailleur
f35fee0081
Prepare 16 dev
2022-01-13 18:55:49 +01:00
Laurent Destailleur
b82b89d519
Prepare 15.0
2022-01-13 18:54:46 +01:00
Laurent Destailleur
b9b45fb506
Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486
...
Conflicts:
test/phpunit/CodingPhpTest.php
2022-01-13 18:46:29 +01:00
Laurent Destailleur
4fe3650736
Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486
2022-01-13 18:34:15 +01:00
lvessiller
cacff0c2d4
FIX cast int for search user
2022-01-13 16:18:57 +01:00
lvessiller
22f6d204a2
FIX search by user in supplier order list
2022-01-13 16:01:23 +01:00
Laurent Destailleur
dbce3cbfbe
Clean code
2022-01-13 16:00:39 +01:00
Laurent Destailleur
52493b60fb
Fix #yogosha8316
2022-01-13 15:52:41 +01:00
BENKE Charlene
90829bd255
Update listbysubaccount.php
2022-01-13 12:23:14 +01:00
BENKE Charlene
05603730ca
Update listbyaccount.php
2022-01-13 12:22:45 +01:00
BENKE Charlene
c4c43fc9f9
Update list.php
2022-01-13 12:22:16 +01:00
BENKE Charlene
cc6dd99bf6
NEW : addMoreActionsButtonsList hook for button in list
2022-01-13 12:20:54 +01:00
Gauthier PC portable 024
55389036d9
FIX : perms
2022-01-13 12:02:05 +01:00
Laurent Destailleur
054116900a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-13 11:59:05 +01:00
Laurent Destailleur
cb03f88fbc
Fix link
2022-01-13 11:58:10 +01:00
Gauthier PC portable 024
a77a2e9bcc
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-13 11:39:54 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-13 11:05:57 +01:00
Laurent Destailleur
620a88b8d6
Fix param sortfield/order
2022-01-13 11:05:21 +01:00
Laurent Destailleur
dc3670bc91
Clean search_status
2022-01-13 11:00:52 +01:00
Harry Winner KF
67ab70f37d
FIX Solving non-blocking bug in user login
...
When using the function check_user_password_dolibarr to authenticate a user, a call is made to the function dol_verifyHash which requires a pre-calculated hash. This hash is not available with programmatically-created never-used accounts. Hence, in suce cases we have the following warning:
Notice: Trying to access array offset on value of type null in .../htdocs/core/lib/security.lib.php on line 156
This fix solves that bug by avoiding that unnecessary call
2022-01-12 15:05:11 -05:00
Marc de Lima Lucio
b110ca6ead
FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse)
2022-01-12 16:40:43 +01:00
Frédéric FRANCE
297d2ecfbd
fix warning
2022-01-12 16:09:31 +01:00
DATUC
800de88c69
Update companies.lang
2022-01-12 12:26:06 +01:00
lvessiller
2d9c46ed3a
NEW pre-filled extra fields with slected credit note
2022-01-12 12:22:43 +01:00
Laurent Destailleur
08e313942d
Merge pull request #19791 from ptibogxiv/patch-457
...
NEW add setup/establishments API (need for recruitment API)
2022-01-12 11:18:52 +01:00
Laurent Destailleur
3daf7d493c
Merge pull request #19792 from ptibogxiv/patch-458
...
FIX bom.class.php
2022-01-12 11:18:29 +01:00
Laurent Destailleur
d7529e55b5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-12 11:18:06 +01:00
Laurent Destailleur
c024585ec9
Trans
2022-01-12 11:13:14 +01:00
Laurent Destailleur
5c4f521025
Merge pull request #19807 from DATUC/patch-14
...
Update companies.lang
2022-01-12 11:10:48 +01:00
Laurent Destailleur
8948d15930
Merge pull request #19798 from DATUC/patch-5
...
Update companies.lang
2022-01-12 11:10:31 +01:00
Laurent Destailleur
d3af00d4e6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-12 10:58:24 +01:00
DATUC
e2306f5915
Update companies.lang
2022-01-12 00:41:05 +01:00
DATUC
89e509b251
Update companies.lang
2022-01-12 00:30:11 +01:00
DATUC
3384632005
Update companies.lang
2022-01-12 00:28:26 +01:00
ptibogxiv
61e6e33387
FIX bom.class.php
2022-01-11 20:37:20 +01:00
ptibogxiv
63611ab717
NEW add setup/establishments API (need for recruitment API)
2022-01-11 20:24:23 +01:00
lvessiller
400f6b244b
FIX user actions rights when mulit-company transverse mode is enabled
2022-01-11 17:29:02 +01:00
Laurent Destailleur
1efbff8fea
Fix error message
2022-01-11 15:42:03 +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
Laurent Destailleur
b824912473
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-11 13:28:07 +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
Gauthier PC portable 024
1910423684
FIX : conf name is MAIN_ADD_LINE_AT_POSITION
2022-01-11 09:54:27 +01:00
Laurent Destailleur
b9915800cf
Fix bad warning
2022-01-11 01:30:24 +01:00
Laurent Destailleur
00108589fd
Fix creation of fields tms into sql scripts
2022-01-11 01:00:31 +01:00
Laurent Destailleur
cde290c78a
Merge pull request #19402 from atm-gauthier/fix_reorder_lines_after_delete_line_everywhere
...
FIX : reorder all lines when delete document line everywhere (4 documents were missing)
2022-01-10 21:23:23 +01:00
Laurent Destailleur
d8a0dfad10
Merge pull request #19557 from yaslama/unaccent
...
Unaccent
2022-01-10 21:19:54 +01:00
Laurent Destailleur
f97ed1b3a3
Merge pull request #19623 from altairis-melina/changepriceht
...
NEW : Add constant to change price HT in TakePos
2022-01-10 21:07:41 +01:00
Laurent Destailleur
564bae453e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-01-10 21:00:38 +01:00
Laurent Destailleur
6871a480e5
Merge pull request #19759 from FHenry/new_refproduct_bom_tooltip
...
NEW: add product ref into BOM tooltips
2022-01-10 20:58:47 +01:00
Laurent Destailleur
c334c3cd58
Update bom.class.php
2022-01-10 20:58:08 +01:00
Laurent Destailleur
865b05aad2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-10 19:29:37 +01:00
Laurent Destailleur
b91b8d35be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-10 19:29:12 +01:00
Laurent Destailleur
1cc16f73d8
FIX #19761
2022-01-10 19:28:57 +01:00
Laurent Destailleur
5d5a219b95
FIX #19770
2022-01-10 19:23:46 +01:00
Laurent Destailleur
d660a7d45f
Merge pull request #19762 from FHenry/dev_fix_19749
...
fix : #19749
2022-01-10 19:10:43 +01:00
Laurent Destailleur
388caadcba
Merge pull request #19768 from randallmoraes/patch-1
...
add support for sharedmailbox in office365
2022-01-10 19:10:08 +01:00
Laurent Destailleur
0f950d121c
Merge pull request #19769 from randallmoraes/patch-2
...
Enable attachements in hook
2022-01-10 19:06:51 +01:00
Laurent Destailleur
8d5cc0bd7d
Merge pull request #19779 from ptibogxiv/patch-456
...
NEW add API REST for recruitment module
2022-01-10 18:32:44 +01:00
Laurent Destailleur
da83d101db
Merge pull request #19778 from atm-john/fix_stuff_on_setup_class
...
FIX : Setup helper class
2022-01-10 18:32:12 +01:00
Laurent Destailleur
d892160f4f
Fix error management
2022-01-10 17:55:45 +01:00
Gauthier PC portable 024
04cc0a0480
NEW : Add column "Total HT" to products array on document creation card
2022-01-10 17:02:15 +01:00
Laurent Destailleur
cfec02aaae
Debug v15
2022-01-10 14:27:43 +01:00
Laurent Destailleur
c81f46842b
Fix too many load of objects
2022-01-10 13:36:28 +01:00
Laurent Destailleur
6c9ed0ab6b
css
2022-01-10 05:07:09 +01:00
Laurent Destailleur
12044fa67a
Debug v15
2022-01-10 03:24:01 +01:00
Laurent Destailleur
05529817f4
css
2022-01-10 00:54:51 +01:00
Laurent Destailleur
1a5e594e59
Fix missing morehtmlref on some tabs
2022-01-10 00:33:54 +01:00
Alexandre SPANGARO
960aaded8e
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
2022-01-09 21:08:06 +01:00
Laurent Destailleur
2a2a8b47d8
Fix link to vcard on contact
2022-01-09 20:43:26 +01:00
Laurent Destailleur
4af80507cb
Fix #yogosha8282
2022-01-09 20:25:10 +01:00
Laurent Destailleur
423a4ea104
Debug v15
2022-01-09 19:48:38 +01:00
stickler-ci
f4f7a360a1
Fixing style errors.
2022-01-09 16:17:22 +00:00
ptibogxiv
eb529a660d
NEW add API REST for recruitment module
2022-01-09 17:14:59 +01:00
Laurent Destailleur
cc72418ab9
Fix example
2022-01-09 14:22:42 +01:00
Laurent Destailleur
4ce77e62c6
Debug v15
2022-01-09 14:19:55 +01:00
Laurent Destailleur
fcfb6a55f4
Fix error management
2022-01-09 13:50:10 +01:00
ATM john
29e5fb0250
Merge branch 'fix_stuff_on_setup_class' into new_convert_setup_to_new_setup
2022-01-09 10:27:34 +01:00
ATM john
bb1ec5940d
Fix setup class
2022-01-09 10:24:28 +01:00
Laurent Destailleur
eddc2a1a26
FIX #yogosha8272
2022-01-08 19:50:55 +01:00
Juanjo Menent
4d5b001869
Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760
2022-01-08 14:50:51 +01:00
Juanjo Menent
840b0e4843
FIX #19760 Uniformize label length
2022-01-08 14:47:40 +01:00
Laurent Destailleur
c3a42162d9
FIX The vat code was not correctly managed on PDF templates
2022-01-08 14:43:24 +01:00
Laurent Destailleur
3a6b5199ec
Debug module intracomm
2022-01-08 01:19:04 +01:00
Randall Mora
2db35c4acc
Enable attachements in hook
...
Enable to send attachments to the hook for custom data processing...
2022-01-07 15:19:18 -06:00
stickler-ci
912f0a8b95
Fixing style errors.
2022-01-07 18:34:00 +00:00
Randall Mora
d8ae40c647
add support for sharedmailbox in office365
...
with 4 code lines enable support when a mailbox is shared...
2022-01-07 12:30:56 -06: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
ff31d660c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-01-07 15:50:40 +01:00
Laurent Destailleur
451fa396aa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2022-01-07 15:49:09 +01:00
Laurent Destailleur
7dfb369a98
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2022-01-07 15:48:23 +01:00
Laurent Destailleur
265aeb76e6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e
FIX avoid infinite loop on dump with popen
2022-01-07 15:35:33 +01:00
Laurent Destailleur
144a8af438
Debug v15
2022-01-07 14:28:58 +01:00
Laurent Destailleur
bdac615cba
Fix empty column
2022-01-07 14:01:15 +01:00
Laurent Destailleur
51a36040f1
Fix special char in sepa file on address
2022-01-07 13:03:03 +01:00
Laurent Destailleur
0d6ef2e76b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-07 12:44:03 +01:00
Laurent Destailleur
500b0e0218
FIX Sepa payment with company name with accent
2022-01-07 12:43:41 +01:00
Laurent Destailleur
6aeae8fe7f
Debug v15
2022-01-07 12:27:07 +01:00
Florian HENRY
f5788bef66
OK BDD
2022-01-07 12:20:27 +01:00
Florian HENRY
e87fb1c0dc
add column into table inst
2022-01-07 12:19:03 +01:00
Florian HENRY
61fc81732c
fix : #19749
2022-01-07 11:29:43 +01:00
Laurent Destailleur
aa64b9c524
Merge pull request #19756 from oscim/patch-44
...
Update paiementfourn.class.php
2022-01-07 10:46:19 +01:00
Laurent Destailleur
f2beaf5eae
Merge pull request #19729 from fmarcet/13.0
...
Fix: correctly display the products of a warehouse in the pdf
2022-01-07 10:45:10 +01:00
Laurent Destailleur
6cecc3c2aa
Fix clean data after update
2022-01-07 10:25:58 +01:00
Quentin VIAL-GOUTEYRON
f78a9ea6f5
missing column
2022-01-07 10:19:44 +01:00
Quentin VIAL-GOUTEYRON
137371cae5
Merge branch 'NEW_contact_project_tab' of github.com:atm-quentin/dolibarr into NEW_contact_project_tab
2022-01-07 10:18:57 +01:00
Quentin VIAL-GOUTEYRON
5fc0f18b0b
add column contact type
2022-01-07 10:17:00 +01:00
Florian HENRY
f5c04c81a9
Merge branch 'new_refproduct_bom_tooltip' of github.com:FHenry/dolibarr into new_refproduct_bom_tooltip
2022-01-07 08:28:40 +01:00
Florian HENRY
59b1feaf2e
fix include
2022-01-07 08:27:49 +01:00
stickler-ci
f71092e05c
Fixing style errors.
2022-01-06 20:56:51 +00:00
Florian HENRY
a0fb0b8741
NEW: add ref product into BOM tooltips
2022-01-06 21:48:12 +01:00
Florian HENRY
c66e26cfd9
display product ref for Object link product tab
2022-01-06 21:38:57 +01:00