lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

80319 Commits

Author SHA1 Message Date
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Francis Appels
91496682fb Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison 2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a Move phpcs enable to correct location @frederic34 2020-10-26 18:13:25 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
stickler-ci
d803c7f429 Fixing style errors. 2020-10-26 16:06:05 +00:00
Francis Appels
fa8e4a9bb0 No trigger for supplier proposal 2020-10-26 17:02:33 +01:00
Francis Appels
d6839ddca6 No trigger for expedition 2020-10-26 16:59:25 +01:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function. 
Use correct naming convention for new method naming.
 2020-10-26 16:50:52 +01:00
CHABANE HADJER
e7e8a91b13
Adding Payzen payment module hooks. 2020-10-26 16:38:11 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
Frédéric FRANCE
1dab6570ed
Merge branch 'develop' into patch-11 2020-10-26 13:36:33 +01:00
Laurent Destailleur
82db2636f0 Fix phpcs 2020-10-26 13:22:03 +01:00
Florian HENRY
457f8b9766 fix bad link index thirdparty 2020-10-26 10:49:07 +01:00
Florian HENRY
cae2bc6024 Merge github.com:Dolibarr/dolibarr into dev_fix_migration_livraison_to_delivery 2020-10-26 10:36:08 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06:00
Frédéric FRANCE
c2b6ff969a
Update datapolicy.class.php 2020-10-26 00:05:43 +01:00
Frédéric FRANCE
44152c9343
undefined variable 2020-10-26 00:00:37 +01:00
Frédéric FRANCE
ab0d5514c7
doxygen 2020-10-25 23:55:08 +01:00
Frédéric FRANCE
f2c0e3765d
Update card.php 2020-10-25 23:29:51 +01:00
Frédéric FRANCE
10ff359889
set unknow variables 2020-10-25 22:39:12 +01:00
Laurent Destailleur
858c48bd15 Fix 2020-10-25 22:12:16 +01:00
Laurent Destailleur
2026705045 Start beta 2020-10-25 21:47:50 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Laurent Destailleur
ec0da6921a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-25 21:10:00 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
javierybar
d23b6e145a
Fixes 2020-10-25 20:24:17 +01:00
Frédéric FRANCE
a031adf99e
clean code 2020-10-25 20:07:22 +01:00
javierybar
a66be11e71
Update index.php 2020-10-25 20:06:50 +01:00
javierybar
81ed97c9ba
NEW Credit invoice in TakePOS 2020-10-25 20:03:25 +01:00
Frédéric FRANCE
772661c6ba
clean code 2020-10-25 19:44:01 +01:00
Frédéric FRANCE
3257e65d09
Update don.class.php 2020-10-25 18:51:05 +01:00
Frédéric FRANCE
f2d21d68d6
selectTypeContact return void 2020-10-25 18:23:00 +01:00
Florian HENRY
949be12e19 fix migration livraison to delivery 2020-10-25 17:26:15 +01:00
Laurent Destailleur
6c1f60f6c0 Fix regression 2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
BENKE Charlene
3efcb0dfeb
Display application Title if filled on login page 2020-10-25 16:19:16 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Frédéric FRANCE
1f4bd8476b
doxygen 2020-10-25 15:42:15 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account 
11878 - select the only bank account
 2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php 2020-10-25 14:55:52 +01:00
Laurent Destailleur
36854b0af4
Merge pull request #15123 from frederic34/patch-8 
fix unknown function
 2020-10-25 14:51:42 +01:00
Laurent Destailleur
80bbec7aeb
Merge pull request #15122 from frederic34/publicmember 
add hook on public new member card
 2020-10-25 14:51:14 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6 
Update commonobject.class.php
 2020-10-25 14:50:56 +01:00
Laurent Destailleur
b80d135fcb
Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage 
fix mail error message
 2020-10-25 14:50:23 +01:00
Laurent Destailleur
7a85f5a9ab
Merge pull request #15118 from hregis/develop_bug2 
FIX avoid warning
 2020-10-25 14:49:06 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
f1cab5aa23
Merge pull request #15125 from frederic34/statcard 
replace & by &&
 2020-10-25 14:47:07 +01:00
Laurent Destailleur
a2f785e8aa
Merge pull request #15126 from frederic34/patch-10 
doxygen
 2020-10-25 14:46:01 +01:00
Laurent Destailleur
cc17f08409
Merge pull request #15131 from frederic34/patch-13 
doxygen
 2020-10-25 14:45:24 +01:00
Laurent Destailleur
21d26c008a
Merge pull request #15130 from bafbes/abb120351 
fix:rowid is string in currencies table
 2020-10-25 14:45:12 +01:00
Laurent Destailleur
335d1db3a6
Update dict.php 2020-10-25 14:43:33 +01:00
Laurent Destailleur
f31b4ee49d
Merge pull request #15127 from frederic34/task_universal 
fix unknown property db
 2020-10-25 14:35:03 +01:00
Laurent Destailleur
c6cee2f96f
Merge pull request #15128 from frederic34/patch-11 
doxygen
 2020-10-25 14:34:15 +01:00
Laurent Destailleur
180d01e76e
Merge pull request #15132 from frederic34/patch-14 
doxygen
 2020-10-25 14:34:04 +01:00
Laurent Destailleur
167430137f
Merge pull request #15134 from frederic34/public_ticket 
add hook on public new ticket
 2020-10-25 14:33:46 +01:00
Laurent Destailleur
9ccafcb651
Merge pull request #15133 from ptibogxiv/patch-390 
Fix takeposlist thirdparty
 2020-10-25 14:33:08 +01:00
Laurent Destailleur
bb6a71c534
Merge pull request #15135 from frederic34/loanlib 
fix variable
 2020-10-25 14:15:18 +01:00
Laurent Destailleur
495d8e711a
Merge pull request #15137 from frederic34/patch-16 
Update chargesociales.class.php
 2020-10-25 14:15:06 +01:00
Laurent Destailleur
a7b23dc4f6
Update chargesociales.class.php 2020-10-25 14:14:50 +01:00
Laurent Destailleur
dfc8606114
Merge pull request #15136 from frederic34/patch-15 
doxygen
 2020-10-25 14:13:54 +01:00
Laurent Destailleur
13beeb0a61
Merge pull request #15138 from frederic34/patch-17 
Update asset.class.php
 2020-10-25 14:13:28 +01:00
Laurent Destailleur
182de28d74 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-25 14:12:51 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Laurent Destailleur
02ef5ad3b9
Merge pull request #15144 from atm-maxime/fix_supp_inv_numbering 
Fix #15064 : error when supplier invoice numbering module is not configured
 2020-10-25 13:58:48 +01:00
Laurent Destailleur
b6db71e5e6
Merge pull request #15146 from atm-maxime/fix_selected_lines_invoice_creation 
Fix #15143 selected lines on invoice creation
 2020-10-25 13:57:00 +01:00
Laurent Destailleur
42a8f75245
Merge pull request #15145 from frederic34/2020_zappier 
add zapier readme
 2020-10-25 13:53:46 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
729a6aa364
hook list 2020-10-25 12:17:43 +01:00
Maxime Kohlhaas
309691f1e7 Fix #15143 selected lines on invoice creation 2020-10-25 09:28:41 +01:00
Maxime Kohlhaas
680ae60b6f Fix #15064 : error when supplier invoice numbering module is not configured 2020-10-25 08:56:34 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account 2020-10-24 17:15:48 +02:00
Frédéric FRANCE
af6629a427
Update asset.class.php 2020-10-24 14:11:28 +02:00
Frédéric FRANCE
5c1fac0f82
Update recruitmentjobposition.class.php 2020-10-24 14:02:34 +02:00
Frédéric FRANCE
f4181a77cd
Update chargesociales.class.php 2020-10-24 13:53:00 +02:00
Frédéric FRANCE
9e9a5efd08
doxygen 2020-10-24 13:47:00 +02:00
Frédéric FRANCE
000fa91235
fix variable 2020-10-24 13:39:59 +02:00
Frédéric FRANCE
8e77ac4eb0
fix empty array 2020-10-24 13:28:38 +02:00
Frédéric FRANCE
302fb6defa
add hook on public new ticket 2020-10-24 13:17:23 +02:00
ptibogxiv
ac800473c3
Update list.php 2020-10-24 12:46:13 +02:00
ptibogxiv
14e67b6536
Fix takeposlist thirdparty 
exclude only supplier thirdparties for more efficient search
 2020-10-24 11:16:36 +02:00
Frédéric FRANCE
adf1cd1fb7
doxygen 2020-10-24 09:42:52 +02:00
Frédéric FRANCE
e476678a54
doxygen 2020-10-24 09:32:39 +02:00
bahfir abbes
3f03b678e9 fix:rowid is string in currencies table 2020-10-24 03:47:10 +01:00
Frédéric FRANCE
3d3b530357
doxygen 2020-10-23 22:24:20 +02:00
Frédéric FRANCE
96e80f116a
fix unknown property db 2020-10-23 22:06:23 +02:00
Frédéric FRANCE
797a553609
Update paypal.lib.php 2020-10-23 22:01:23 +02:00
Frédéric FRANCE
7cfa710d48
replace & by && 2020-10-23 21:53:18 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
345015ece2
fix unknown function 2020-10-23 19:54:45 +02:00
Frédéric FRANCE
76a0eba1a0
add hook on public new member card 2020-10-23 18:49:06 +02:00
Frédéric FRANCE
c3863aeed8
Update commonobject.class.php 2020-10-23 18:18:01 +02:00
Laurent Destailleur
50da1cd95e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-10-23 17:33:14 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
377c44eeab
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required 
FIX no empty value in required extrafield
 2020-10-23 17:29:12 +02:00
Florian HENRY
53a76dc01f fix mail error message 2020-10-23 16:39:45 +02:00
Regis Houssin
3fbeea15c0 FIX avoid warning 2020-10-23 15:43:48 +02:00
Laurent Destailleur
cddbbc76c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-23 15:31:35 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
Laurent Destailleur
58597bc8fe
Merge pull request #15058 from Hystepik/develop 
FIX pb of duplicate event on command
 2020-10-23 14:12:42 +02:00
Laurent Destailleur
8d5d7f801c
Merge branch 'develop' into patch-7 2020-10-23 14:10:33 +02:00
Laurent Destailleur
7875082032
Merge pull request #15114 from frederic34/patch-6 
fix phpcs
 2020-10-23 14:09:08 +02:00
Laurent Destailleur
d21ad72e4a Fix phpcs 2020-10-23 13:58:19 +02:00
jpb
47351c3cb3 Fix : stickler-ci 2020-10-23 13:55:55 +02:00
Laurent Destailleur
ffcf8edd19 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-23 13:55:42 +02:00
Laurent Destailleur
edbf4dc375 Fix doc 2020-10-23 13:55:14 +02:00
jpb
63c82b47fe Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate 2020-10-23 12:27:14 +02:00
jpb
1ecff0a608 add list and crud 2020-10-23 11:58:25 +02:00
lmarcouiller
42aafeb8b5 FIX pb of duplicate event on command with eldy's recommendations 2020-10-23 09:56:35 +02:00
Frédéric FRANCE
0f1996759f
fix phpcs 2020-10-23 08:12:19 +02:00
Frédéric FRANCE
57064a7976
fix phpcs 2020-10-23 08:07:00 +02:00
Laurent Destailleur
81543df5e4 Fix warnings 2020-10-23 04:24:54 +02:00
Laurent Destailleur
e22760e8d5
Merge pull request #15113 from frederic34/patch-8 
code field for product nature must be numeric
 2020-10-23 04:08:39 +02:00
Laurent Destailleur
517c8e862f
Merge pull request #15112 from frederic34/patch-7 
Update intracommreport.class.php
 2020-10-23 04:08:12 +02:00
Laurent Destailleur
6b6ce568c7
Merge pull request #15109 from frederic34/patch-6 
doxygen
 2020-10-23 04:07:29 +02:00
Laurent Destailleur
0a1e49447d
Merge pull request #15108 from frederic34/patch-4 
Update cproductnature.class.php
 2020-10-23 04:07:03 +02:00
Laurent Destailleur
3bab0a322d
Merge pull request #15110 from frederic34/dol_fiche_head 
replace deprecated
 2020-10-23 04:03:46 +02:00
Laurent Destailleur
254da6923b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/line.php
 2020-10-23 04:00:45 +02:00
Laurent Destailleur
0e25843baa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2020-10-23 03:59:11 +02:00
Laurent Destailleur
c9a73cc380 Fix phpcs 2020-10-23 03:55:18 +02:00
Laurent Destailleur
62420c5e7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2020-10-23 03:51:22 +02:00
Laurent Destailleur
e0e4da481a Fix phpcs 2020-10-23 03:42:54 +02:00
Laurent Destailleur
d9aa83e699 Fix phpcs 2020-10-23 03:41:26 +02:00
stickler-ci
5638a49774 Fixing style errors. 2020-10-22 22:23:03 +00:00
Frédéric FRANCE
43bb812260
Update cproductnature.class.php 2020-10-23 00:22:34 +02:00
Frédéric FRANCE
78ec68e2cf
code field for product nature must be numeric 2020-10-23 00:04:55 +02:00
Frédéric FRANCE
c2ea4f063b
Update intracommreport.class.php 2020-10-22 23:50:20 +02:00
Frédéric FRANCE
2146ce2dee
Update intracommreport.class.php 2020-10-22 23:37:29 +02:00
Frédéric FRANCE
0db7847ba7
Update intracommreport.class.php 2020-10-22 23:24:11 +02:00
Frédéric FRANCE
82c3f63c5c
replace deprecated 2020-10-22 22:54:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
1bb2fc0db4 css 2020-10-22 22:45:27 +02:00
Frédéric FRANCE
ae1adfb2d7
Update product.class.php 2020-10-22 22:33:35 +02:00
Frédéric FRANCE
ed8bfa26fb
Update cproductnature.class.php 2020-10-22 22:20:48 +02:00
Laurent Destailleur
19efd633e9
Merge pull request #15107 from frederic34/patch-4 
Update api_contracts.class.php
 2020-10-22 21:59:47 +02:00
Laurent Destailleur
c77184c848 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 21:57:24 +02:00
Laurent Destailleur
0e442abd36 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2020-10-22 21:57:13 +02:00
Laurent Destailleur
15bbba3f52 Remove warning 2020-10-22 21:55:01 +02:00
Frédéric FRANCE
12dc82c340
Update api_contracts.class.php 2020-10-22 21:51:42 +02:00
Laurent Destailleur
a5e2ab2822
Merge pull request #15106 from frederic34/rejet 
add type
 2020-10-22 21:36:36 +02:00
Laurent Destailleur
42963f3059
Merge pull request #15105 from frederic34/patch-6 
Update product.class.php
 2020-10-22 21:36:11 +02:00
Laurent Destailleur
4917fb187e
Merge pull request #15104 from ptibogxiv/patch-389 
FIX lang to #15055
 2020-10-22 21:35:37 +02:00
Laurent Destailleur
8505810f90
Merge pull request #15103 from hregis/develop_bug2 
FIX sql syntax error
 2020-10-22 21:35:14 +02:00
Frédéric FRANCE
f4b42234ec
add space 2020-10-22 21:32:12 +02:00
Laurent Destailleur
9699bdc0fa Fix phpcs 2020-10-22 21:31:34 +02:00
Frédéric FRANCE
02403ba640
add type 2020-10-22 21:29:33 +02:00
Frédéric FRANCE
36ad3bfbc9
Update product.class.php 2020-10-22 21:11:49 +02:00
ptibogxiv
f3848dac1e
FIX lang to #15055 2020-10-22 20:06:56 +02:00
Laurent Destailleur
b61e5dc9eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 20:03:41 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Regis Houssin
cbb6e4effe FIX sql syntax error 2020-10-22 19:32:32 +02:00
Laurent Destailleur
e811a9b13e
Merge pull request #15097 from marc-dll/FIX_10.0_supplier_invoice_echeance 
FIX: supplier invoice: automatically calculate payment term when modifying payment condition
 2020-10-22 18:40:07 +02:00
Laurent Destailleur
b4581b6af8
Better error management 2020-10-22 18:39:45 +02:00
Laurent Destailleur
62d3d1690e
Merge pull request #15102 from fappels/develop_fix_user_list 
Fix user list SQL error when user module has extrafields
 2020-10-22 18:35:28 +02:00
Laurent Destailleur
c05b96f58e
Merge pull request #15099 from joseplluis/patch-10 
NEW form to add customer/supplier into categories
 2020-10-22 18:33:29 +02:00
Laurent Destailleur
a6484e933b Css 2020-10-22 18:28:47 +02:00
Marc de Lima Lucio
594d9e321e FIX: invoice payment terms edition: error management 2020-10-22 18:28:27 +02:00
Laurent Destailleur
fb7202b7f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Francis Appels
89f00b9114 Fix user list when user module has extrafields 2020-10-22 17:54:33 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
a826e328c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:40 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Laurent Destailleur
f04dc4de15
Merge pull request #15050 from frederic34/patch-4 
Fix upload photo
 2020-10-22 17:24:06 +02:00
Laurent Destailleur
30d39f890c
Merge pull request #15054 from ptibogxiv/patch-387 
NEW display date range if exist in takepos
 2020-10-22 17:16:46 +02:00
Laurent Destailleur
7816e5d757
Merge pull request #15055 from ptibogxiv/patch-388 
NEW add alert before change thirdparty in takepos
 2020-10-22 17:16:19 +02:00
Philippe GRAND
a2b3dbd8f8 fix : deprecated 2020-10-22 16:47:35 +02:00
Philippe GRAND
dc0d9e46b8 fix : deprecated 2020-10-22 16:46:45 +02:00
Philippe GRAND
74fc38395c fix : deprecated 2020-10-22 16:44:26 +02:00
Philippe GRAND
e0639209a7 fix : deprecated 2020-10-22 16:43:35 +02:00
Philippe GRAND
0fc054a624 fix : deprecated 2020-10-22 16:43:02 +02:00
Philippe GRAND
3ee7cfc1b7 fix : deprecated 2020-10-22 16:42:32 +02:00
Philippe GRAND
a8b25e32f0 fix : deprecated 2020-10-22 16:40:58 +02:00
Philippe GRAND
d5e456fd36 fix : deprecated 2020-10-22 16:40:03 +02:00
Philippe GRAND
3854808d21 fix : deprecated 2020-10-22 16:39:21 +02:00
Florian HENRY
10a3786bab fix MAIN_AUTOFILL_DATE for expense payment date 2020-10-22 16:38:59 +02:00
Philippe GRAND
9dc93b0e29 fix : deprecated 2020-10-22 16:38:43 +02:00
Philippe GRAND
52b602b1ce fix : deprecated 2020-10-22 16:38:02 +02:00
Philippe GRAND
9260eed12a fix : deprecated 2020-10-22 16:37:06 +02:00
Philippe GRAND
1319765a4f fix : deprecated 2020-10-22 16:35:47 +02:00
Laurent Destailleur
3369379ba1
Update card.php 2020-10-22 16:34:23 +02:00
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Philippe GRAND
fae572d43a fix : deprecated 2020-10-22 16:29:17 +02:00
Laurent Destailleur
ec2a91471e
Merge pull request #15096 from dvasseur/patch-1 
NEW Allow to edit "demand reason" field though API
 2020-10-22 16:19:11 +02:00
Marc de Lima Lucio
34dd486b6c FIX: virtual products: displayed value is by unit 2020-10-22 16:18:37 +02:00
Laurent Destailleur
0f435f9901
Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services 
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…
 2020-10-22 16:18:11 +02:00
Laurent Destailleur
a9117fe864
Update interface_20_modWorkflow_WorkflowManager.class.php 2020-10-22 16:18:00 +02:00
Laurent Destailleur
fec8e5a0b8
Merge pull request #15022 from bafbes/abb120350 
new:handle new type reference in add and update actions
 2020-10-22 16:16:52 +02:00
Laurent Destailleur
81bfbbac26
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:37 +02:00
Laurent Destailleur
0c3f8d2daa
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:14 +02:00
stickler-ci
b5c2c6b755 Fixing style errors. 2020-10-22 14:15:16 +00:00
Laurent Destailleur
b88a9fc94d
Update actions_addupdatedelete.inc.php 2020-10-22 16:15:11 +02:00
Laurent Destailleur
2702bd023f
Merge pull request #15059 from frederic34/patch-6 
Add ref instead id in bank check remittance
 2020-10-22 16:12:31 +02:00
Josep Lluís
31ae2f2a21
NEW form to add customer/supplier into categories 
Form to add customers and suppliers into categories, as in products
 2020-10-22 16:12:01 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020 
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
 2020-10-22 16:11:47 +02:00
Laurent Destailleur
9c9d468a18
Merge pull request #15052 from andreubisquerra/master 
TakePOS connector compatibility with templates
 2020-10-22 16:11:16 +02:00
Marc de Lima Lucio
1795ec6a9d FIX: supplier invoice: autoatically calculate payment term when modifying payment condition 2020-10-22 16:11:12 +02:00
Got2be
c2ad40043f FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty 2020-10-22 16:10:47 +02:00
Laurent Destailleur
db06dc54a5
Merge pull request #15061 from hregis/develop_bug2 
FIX wrong object name
 2020-10-22 16:10:15 +02:00
Laurent Destailleur
648efbc0cb
Merge pull request #15067 from prietojc/12.0 
FIX: Payment by BankTransfer
 2020-10-22 15:59:19 +02:00
Laurent Destailleur
ca93f732c8
Update line.php 2020-10-22 15:59:04 +02:00
Laurent Destailleur
b9e6b188bc
Update rejetprelevement.class.php 2020-10-22 15:58:24 +02:00
Laurent Destailleur
10a8ce82a9
Update bonprelevement.class.php 2020-10-22 15:57:25 +02:00
Laurent Destailleur
315f125f28
Merge pull request #15068 from OPEN-DSI/calculate_virtual_stock_transverse_mode 
NEW : Calculate the virtual stock in transverse mode
 2020-10-22 15:56:03 +02:00
David
12a599d1c7
Allow "demand reason" field update though API 2020-10-22 15:53:55 +02:00
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop 
CLOSE #15065 Put the product label in bold in the PDF templates if co…
 2020-10-22 15:53:43 +02:00
Laurent Destailleur
272caceab9
Merge pull request #15071 from joseplluis/patch-8 
Add customer country information in popup
 2020-10-22 15:53:12 +02:00
Laurent Destailleur
5a52534675
Merge pull request #15072 from FHenry/12.0_fix_14649 
FIX #14649
 2020-10-22 15:51:31 +02:00
Laurent Destailleur
37749e8e9c
Merge pull request #15075 from FHenry/12.0_fix_status_receipt_tot 
fix set status on order Receipt when no dispatch
 2020-10-22 15:50:30 +02:00
Laurent Destailleur
88df2ef36d
Merge pull request #15076 from FHenry/12.0_fix_margin_token 
fix form token missing
 2020-10-22 15:49:56 +02:00
Laurent Destailleur
a83131276d
Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation 
new: add PDFInvoiceSituation translation key for PDF title
 2020-10-22 15:49:25 +02:00
Laurent Destailleur
1a70c016c5
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights 
Add rights on margin info on invoice list
 2020-10-22 15:49:05 +02:00
Laurent Destailleur
bf6ec35478
Merge pull request #15095 from joseplluis/patch-9 
FIX input name in MRP mask const
 2020-10-22 15:45:36 +02:00
Laurent Destailleur
b96a59b089
Merge pull request #15086 from ppenelon/develop 
NEW Retrieve discount from invoice from API
 2020-10-22 15:45:09 +02:00
Laurent Destailleur
d7b7e1e386
Merge pull request #15083 from frederic34/printing_module 
can add a driver for printing in module
 2020-10-22 15:43:55 +02:00
Laurent Destailleur
9775728b7d
Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order 
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
 2020-10-22 15:43:31 +02:00
Josep Lluís
1221cc854d
FIX input name in MRP mask const 
input name in MRP mask const was wrong
 2020-10-22 15:23:45 +02:00
Marc de Lima Lucio
a232a19e7d FIX: virtual products: supplier discount was not applied in component list 2020-10-22 15:16:33 +02:00
Laurent Destailleur
d521ad6db4
Update objectline_edit.tpl.php 2020-10-22 15:11:54 +02:00
Laurent Destailleur
46a31f443d
Update objectline_create.tpl.php 2020-10-22 15:11:01 +02:00
Florian Mortgat
56db7d6c64 FIX: also check if there is a method $object->fetch_thirdparty() before calling it 2020-10-22 15:09:48 +02:00
Laurent Destailleur
a5d52baa05
Merge pull request #15089 from frederic34/patch-7 
fill incoterms with company parameters
 2020-10-22 15:09:47 +02:00
Laurent Destailleur
b45c99faec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5 FIX #14995 2020-10-22 15:03:12 +02:00
lvessiller
b13ef34804 NEW add rights on margin info on invoice list 2020-10-22 14:56:53 +02:00
Frédéric FRANCE
7d8df07253
Update card.php 2020-10-22 11:46:12 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php 2020-10-22 09:56:13 +02:00
Pierre Penelon
b8cb080f0d
ADD Retrieve discount from invoice from API 
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
 2020-10-22 09:26:46 +02:00
Florian Mortgat
509819c119 FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order) 2020-10-21 23:19:29 +02:00
Frédéric FRANCE
f54164bd10
modify action 2020-10-21 21:33:23 +02:00
Frédéric FRANCE
f500076247
remove warning 2020-10-21 21:21:30 +02:00
Frédéric FRANCE
4873794dc0
doxygen 2020-10-21 21:08:33 +02:00
Frédéric FRANCE
06325f9422
doxygen 2020-10-21 21:00:50 +02:00
Florian HENRY
93a97492ae review 2020-10-21 20:41:50 +02:00
Florian HENRY
0a9293c9c6 fix token CSRF check for getSupplierPrice ajax call 2020-10-21 20:40:53 +02:00
Frédéric FRANCE
81f6a7abb6
can add a driver for printing in module 2020-10-21 20:18:06 +02:00
Laurent Destailleur
351c8a5a2d Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-10-21 20:10:43 +02:00
Laurent Destailleur
a96c193ab0
Merge pull request #15078 from FHenry/12.0_fix_if_no_pdf_model_no_pdf_created 
FIX if no PDF default model in admin for expense report, do not create a PDF
 2020-10-21 19:55:43 +02:00
Laurent Destailleur
7605cb1871
Update facture_situation.php 2020-10-21 19:54:28 +02:00
Laurent Destailleur
30f8dbad59
Merge pull request #15081 from OPEN-DSI/new-invoice-list-margin-info 
NEW add margin info in invoice list
 2020-10-21 19:53:07 +02:00
Laurent Destailleur
409f8f9866 Update doc 2020-10-21 19:50:40 +02:00
Frédéric FRANCE
672797aa65
add missing parameter 2020-10-21 17:09:40 +02:00
lvessiller
9b423106dc NEW add margin info in invoice list 2020-10-21 16:10:48 +02:00
John Botella
70790009a9 Fix display warranty fields on page load 2020-10-21 14:49:51 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Florian HENRY
c9e62845e8 fix is no PDF default model for expense report, no PDF created 2020-10-21 13:41:17 +02:00
John Botella
d9074e70e1 FIX admin conf selected 2020-10-21 13:27:37 +02:00
Florian HENRY
e23a289553 fix form token missing 2020-10-21 13:26:28 +02:00
Florian HENRY
b0641e6d69 better rix 2020-10-21 13:22:32 +02:00
Florian HENRY
a5e195d1c7 better rix 2020-10-21 13:20:17 +02:00
Florian HENRY
13dfa56c2f fix recipt when no dispatch 2020-10-21 13:18:11 +02:00
Laurent Destailleur
a729bff062 Fix trans 2020-10-21 11:54:18 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +02:00
Laurent Destailleur
2a31d43938 FIX Show errors in session on login page 2020-10-20 18:41:26 +02:00
stickler-ci
ff02bba5bf Fixing style errors. 2020-10-20 15:18:29 +00:00
Josep Lluís
e51dd2919e
Add customer country information in popup 
Add customer country information in popup of draft invoices.
In other boxes it's ok.
 2020-10-20 17:15:03 +02:00
Florian Mortgat
529dfb8dfb FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched 2020-10-20 16:37:15 +02:00
Laurent Destailleur
4ec4801c77 FIX Only template of enabled modules visible 2020-10-20 15:54:08 +02:00
kamel
134994882c NEW : Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') ) 2020-10-20 15:52:29 +02:00
Louis Carrese
693e345cab CLOSE #15065 Fix formatting 
Had spaces instead of tabs...
 2020-10-20 14:34:17 +02:00
Louis Carrese
f377456132 CLOSE #15065 Put the product label in bold in the PDF templates if configured 
The global configuration variable PDF_BOLD_PRODUCT_LABEL is checked to put the product label in bold in the PDF
templates.
This modification is based on the same behaviour for the product reference, found at line 1373 of the same file.

The products table of the invoices / commercial propositions is produced in the PDF library, hence we have to modify
this library to style the invoices.
Producing a new template would mean duplicating code from the library with the maintenace implications.
 2020-10-20 14:19:37 +02:00
jcp
b09a618f38 Fix Bank Transfer 2020-10-20 13:19:47 +02:00
jcp
a2d242356a Fix BankTransfer (V12.0.2) 2020-10-20 13:17:14 +02:00
Philippe Grand
85513318d0
Update functions.lib.php 2020-10-20 09:30:41 +02:00
Regis Houssin
c0981128ff FIX wrong object name 2020-10-19 17:10:38 +02:00
Philippe GRAND
5233c6064f fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/.../domains/httpdocs/core/lib/functions.lib.php on line 4379 2020-10-19 16:30:12 +02:00
lmarcouiller
1ee8c34bf5 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:20:49 +02:00
lmarcouiller
90b2d41b02 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:19:34 +02:00
lmarcouiller
64d8d5334c FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:12:32 +02:00
Frédéric FRANCE
78bc3ecbfd
Add ref instead id in bank check remittance 2020-10-19 14:10:48 +02:00
lmarcouiller
edd391da3a FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:09:55 +02:00
lmarcouiller
511943c052 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:05:32 +02:00
lmarcouiller
71db2603e1 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 13:52:12 +02:00
stickler-ci
18b71e2fa6 Fixing style errors. 2020-10-18 13:38:00 +00:00
ptibogxiv
e1a7de32e1
NEW add alert before change thirdparty in takepos 
With some prices rules, change thirdparty should only done before add products to draft invoice.
We can't block it but display an alert can be done for users
 2020-10-18 15:36:04 +02:00
Laurent Destailleur
ef182bed07 Fix browser reminder 2020-10-18 14:00:47 +02:00
ptibogxiv
7e8891bef9
NEW display date range if exist in takepos 
usefull for membership via POS (ie use in adherentsplus before pushing in core)
 2020-10-18 12:40:10 +02:00
jove@bisquerra.com
1283c6e095 TakePOS connector compatibility with templates 2020-10-18 09:29:33 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required 2020-10-17 21:15:52 +02:00
Laurent Destailleur
547b3602cc FIX refresh of tasks combo must use an ajax page not a full html page 2020-10-17 21:14:19 +02:00
Laurent De Coninck
cea7fd6894
select the only bank account 
When there is only one bank account in the dropdown of the bank account,
select it by default.

[see: #11878]
 2020-10-17 20:45:37 +02:00
Frédéric FRANCE
8fd4101876
Fix upload photo 2020-10-17 20:43:34 +02:00
Laurent Destailleur
53eef48596 Doc 2020-10-17 20:06:30 +02:00
Laurent Destailleur
a9521b13f9 FIX Assignement of event to create when created from view per user. 2020-10-17 19:52:23 +02:00
Laurent Destailleur
8432a2a0dd Fix phpcs 2020-10-17 19:05:08 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
fb3d18f962
Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load 
FIX load default linked options for linked sellist extra fields
 2020-10-17 18:13:13 +02:00
Laurent Destailleur
4fe857f5d2 Change picto to close a widget 2020-10-17 17:54:09 +02:00
Laurent Destailleur
05535556c7 css 2020-10-17 16:39:47 +02:00
Laurent Destailleur
1a1e23bf5d Clean code 2020-10-17 16:01:43 +02:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
27698ab5c7 Protect page for module management with token even for GET action 2020-10-17 14:01:09 +02:00