lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,547 Commits 43 Branches 150 Tags 886 MiB
3d3a7bfd37
Commit Graph

9287 Commits

Author SHA1 Message Date
andreubisquerra
abda9eeb93
Improve compatibility with logo printing with TakePOS connector 2021-02-14 00:02:03 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Laurent Destailleur
e37a4be1d6
Update html.form.class.php 2021-02-11 20:10:15 +01:00
Anthony Berton
d10e46adca Update commonobject.class.php 2021-02-11 17:46:28 +01:00
Anthony Berton
55f8d64202 Update commonobject.class.php 2021-02-11 12:16:07 +01:00
Laurent Destailleur
a01301c500 Fix regression in color of bar for type = line 2021-02-10 18:44:09 +01:00
Laurent Destailleur
623d7b9819 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-10 18:04:23 +01:00
Laurent Destailleur
88550ab417 Look and feel v14 2021-02-10 18:03:45 +01:00
Laurent Destailleur
72bfa81082
Update html.form.class.php 2021-02-10 14:14:28 +01:00
Laurent Destailleur
4f2e7c51fc Fix #16129 autodetect language on public pages 2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6 FIX #16129 2021-02-10 03:12:19 +01:00
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
499ebd73b1
Merge pull request #16192 from FHenry/dev_add_hook_ecm_auto 
NEW : add hook addSectionECMAuto method to add cuistom diretory into ECM auto files
 2021-02-10 01:32:29 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
abb
17f77b8edb New : Hook selectForFormsListWhere 2021-02-09 23:49:46 +01:00
Frédéric FRANCE
da8c80071f
Update html.form.class.php 2021-02-09 18:09:35 +01:00
Laurent Destailleur
21558dd0a6 Debug and enhance the feature to assign tasks on project assignation 2021-02-09 17:52:33 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact 
NEW: When add contact/user to Project, ask to also affect on Tasks
 2021-02-09 13:43:08 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Frédéric FRANCE
266b217675
add var def in commondocgenerator 2021-02-09 08:35:22 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Florian HENRY
b3872ca28a Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto 2021-02-08 20:06:08 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
925d81d1b3
Merge pull request #16002 from Hystepik/develop#1 
New update of funnel of prospection
 2021-02-08 18:05:48 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects 
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
 2021-02-08 17:19:40 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Florian HENRY
1e8117dc8a fix js 2021-02-08 11:49:30 +01:00
Florian HENRY
31ca17c619 fix require once 2021-02-08 11:06:21 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Laurent Destailleur
c24a8a22d5
Merge pull request #16203 from frederic34/patch-3 
fix phpcs
 2021-02-07 19:56:07 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems 
Conflicts:
	htdocs/core/lib/company.lib.php
 2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Frédéric FRANCE
b3dc87f3b7
fix phpcs 2021-02-07 18:31:31 +01:00
Laurent Destailleur
d4df62f1da Look and feel v14 2021-02-07 17:25:41 +01:00
Florian HENRY
377427da1d add hook to custom directory into automatic file ECM 2021-02-06 13:25:35 +01:00
Florian HENRY
3b4f8c32f7 add hook to custom directory into automatic file ECM 2021-02-06 13:21:16 +01:00
Florian HENRY
901b3287a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto 2021-02-06 12:41:59 +01:00
Laurent Destailleur
c1eba5a885
Merge pull request #16188 from frederic34/menuprefix 
modules can add prefix for menu
 2021-02-06 11:41:46 +01:00
Frédéric FRANCE
df67de08b1
modules can add prefix for menu 2021-02-06 10:16:07 +01:00
Laurent Destailleur
b2aab07842
Merge pull request #16180 from grandoc/new_branch_05_02_2021 
update minimum version
 2021-02-06 00:19:17 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
Philippe GRAND
b2e61aa499 fix typo 2021-02-05 18:23:17 +01:00
Laurent Destailleur
653fa38b06 Fix autoselect of category with 'auto' 2021-02-05 15:12:12 +01:00
Laurent Destailleur
7278a8c17f Fix autoselect of category with 'auto' 2021-02-05 15:07:07 +01:00
Laurent Destailleur
2851bac0af Fix param urlencode 2021-02-05 14:46:20 +01:00
Florian HENRY
df7f18d4d2 add hook to add directory into ECM auto files 2021-02-05 13:33:48 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Florian HENRY
2d77787bba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly 2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79 no inner join 2021-02-04 09:05:58 +01:00
Laurent Destailleur
31e1e3e4df Fix cookie for remind the collapse status 2021-02-03 22:37:20 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
787e03a10d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 20:46:22 +01:00
Laurent Destailleur
4bba124c3f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:32 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
bd9eb4c949 FIX Assignement of actors on tasks 2021-02-02 15:36:54 +01:00
Laurent Destailleur
fed99aa3bb FIX Assignement of actors on tasks 2021-02-02 15:35:40 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
85357a34c8 Fix style of injected combo to select variant 2021-02-02 13:12:12 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
e6deed1601 Fix collapse 2021-02-01 15:40:59 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Laurent Destailleur
641885d814 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:05:27 +01:00
Laurent Destailleur
3801dd34cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 19:02:57 +01:00
Laurent Destailleur
d023afb66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-31 18:55:11 +01:00
Laurent Destailleur
18d222f32f Fix code comment 2021-01-31 18:06:02 +01:00
Laurent Destailleur
e5b4c76a26 Fix combo to select action status 2021-01-28 19:38:47 +01:00
Laurent Destailleur
db9b6b53da NEW Can set a label as placeholder for combo lists. 2021-01-28 16:31:32 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Florian Mortgat
8dfe39258b FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion 2021-01-27 23:46:09 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +01:00
Adrien Raze
6ab63a10d6 FIX : Linked extrafields don't work with string value 2021-01-26 09:37:28 +01:00
Laurent Destailleur
0861c639ae Fix sql injection 2021-01-25 12:40:52 +01:00
Laurent Destailleur
470cd5c682 Clean code 2021-01-25 12:39:44 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
c5bbaffb50 Fix look and feel v13 2021-01-23 19:50:04 +01:00
Laurent Destailleur
21e55d1542 NEW Can filter files in GED on status Shared/Not shared 2021-01-23 13:56:51 +01:00
Laurent Destailleur
791f5f3f62 Fix css 2021-01-23 13:50:06 +01:00
lmarcouiller
60d6de86f1 change of line 1346 because miss remove 2021-01-21 14:31:18 +01:00
Laurent Destailleur
af438624a6
Update commonobject.class.php 2021-01-21 13:21:22 +01:00
Laurent Destailleur
0a55ba32f8
Merge branch 'develop' into FIX/Linked_extrafields_10.0 2021-01-21 13:20:34 +01:00
Adrien Raze
645685d16e FIX : Linked extrafields list 2021-01-20 18:39:18 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
7cb8d5af55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075 Clean code 2021-01-19 12:25:05 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +01:00
Laurent Destailleur
01996261dc
Merge pull request #15985 from frederic34/codesyntax 
code syntax
 2021-01-19 11:29:18 +01:00
lmarcouiller
afab5a977a dolgrap.class.php with frederic34 advices 2 2021-01-19 09:43:06 +01:00
lmarcouiller
d69e36c110 Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1 2021-01-19 09:11:29 +01:00
lmarcouiller
82b688a2b0 dolgrap.class.php with frederic34 advices 2021-01-19 09:10:15 +01:00
lmarcouiller
fd888be5e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-01-19 09:05:08 +01:00
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +01:00
Frédéric FRANCE
36eeef81bf
code syntax 2021-01-19 00:41:39 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Gauthier PC portable 024
2cfaf5fbd6 NEW : add real payments on vat objects 2021-01-18 17:08:17 +01:00
David Bensel
85d63891d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 17:31:49 +03:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00
stickler-ci
fe01f35207 Fixing style errors. 2021-01-18 10:33:46 +00:00
lmarcouiller
383281e5f3 New update of funnel of prospection 2021-01-18 11:32:02 +01:00
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
 2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Frédéric FRANCE
f71d803da8
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-17 20:21:05 +01:00
Laurent Destailleur
62300689f8 Fix look and feel v13 2021-01-17 15:59:04 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
 2021-01-17 11:34:19 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Frédéric FRANCE
177b87da0d
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-16 17:58:01 +01:00
Laurent Destailleur
506d809712 FIX #15991 2021-01-16 17:50:02 +01:00
Laurent Destailleur
d67e0621dd
Merge pull request #15994 from andreubisquerra/develop 
FIX Avoid php errors if negative var in Receipt Module
 2021-01-16 17:25:40 +01:00
Laurent Destailleur
f2488a399e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 17:13:54 +01:00
Laurent Destailleur
cdcc6b7324
Merge pull request #15974 from frederic34/davadmin 
fix trans
 2021-01-16 17:13:37 +01:00
Laurent Destailleur
ab1e49ab20
Merge pull request #15986 from aspangaro/13a27 
Optimize select_auxaccount
 2021-01-16 16:59:20 +01:00
Laurent Destailleur
8c8ffa3daf Fix default limit 2021-01-16 16:56:49 +01:00
Laurent Destailleur
04e669ec96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/other.lang
 2021-01-16 15:38:34 +01:00
Laurent Destailleur
892bd432e4 Fix crop of image on invoices. 2021-01-16 15:35:15 +01:00
Frédéric FRANCE
2df0acd419
code syntax 2021-01-16 14:12:09 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
4864808e4d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-01-16 13:45:34 +01:00
Laurent Destailleur
b3d7783a29 Fix multicompany compatibility of preview of file in email form 2021-01-16 13:41:27 +01:00
andreubisquerra
2f9f933ea8
FIX Avoid php errors if negative var in Receipt Module 2021-01-15 19:28:12 +01:00
Laurent Destailleur
32bd194f8e Sort array 2021-01-15 17:47:14 +01:00
Laurent Destailleur
4b66f6bcd3 Restrict list to customer and supplier only 
Merge 2 sql request in to 1
 2021-01-15 17:43:54 +01:00
Alexandre SPANGARO
0904212c0b Better works 2021-01-15 14:19:41 +01:00
Laurent Destailleur
39b6f2fb6a Revert. restore old behaviour, the picto before the input field lead to 
confusion for some users and break presentation with some pages
 2021-01-15 13:36:24 +01:00
Laurent Destailleur
dc9cd28437 Look and feel v14 2021-01-15 13:14:21 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Alexandre SPANGARO
e812c200c5 Optimize select_auxaccount 2021-01-15 03:37:17 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Frédéric FRANCE
923a5fe2a5
Merge remote-tracking branch 'upstream/develop' into davadmin 2021-01-13 18:45:29 +01:00
Laurent Destailleur
43161be711 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 17:45:38 +01:00
Laurent Destailleur
0af5c9ae91 Fix phpcs 2021-01-13 17:45:17 +01:00
Frédéric FRANCE
40a45efb63
fix code 2021-01-13 16:23:54 +01:00
Frédéric FRANCE
cb7266d261
fix trans 2021-01-13 16:18:23 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Laurent Destailleur
1571b0496c
Merge pull request #15794 from atm-gauthier/develop_new_workstation 
NEW : Workstations management
 2021-01-13 12:19:38 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Frédéric FRANCE
dad329602a
Update html.formmail.class.php 2021-01-12 23:46:29 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Laurent Destailleur
2e9f3b803d Add some hooks to add new buttons (compensation of removal of tabs). 
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
 2021-01-12 13:59:20 +01:00
Florian HENRY
98eff62aff Merge branch '13_backport' into dev_fix_contact_bulk 2021-01-12 10:25:18 +01:00
Florian HENRY
e34a797899 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport 2021-01-12 10:21:35 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Florian HENRY
21e1d5c8c9 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-11 18:07:10 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
238fd5accb
Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists 
NEW Can filter on extrafields date on lists
 2021-01-11 16:41:01 +01:00
Laurent Destailleur
9962c182c4
Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr 
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
 2021-01-11 16:15:45 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Gauthier PC portable 024
6668cfa311 FIX : name in copyrights 2021-01-11 11:40:04 +01:00
Gauthier PC portable 024
e3e4f0590c FIX : get and delete linked items with association tables methods created in common object 2021-01-11 11:36:19 +01:00
Florian Mortgat
6a759b4bd0 Merge branch 'refs/heads/develop' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:21:58 +01:00
Florian Mortgat
77933de467 Merge branch '12.0' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:08:52 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353 
New: add notification on ACTION_CREATE event
 2021-01-07 11:17:33 +01:00
Laurent Destailleur
4f55d51eac
Merge pull request #15886 from FHenry/dev_add_column_propal_order 
NEW : Column shippement method, payment mode, payment term in propal and order list
 2021-01-07 11:04:30 +01:00
Laurent Destailleur
3d2dc59468
Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment 
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
 2021-01-07 10:49:06 +01:00
Laurent Destailleur
a1d20ed9c2
Merge pull request #15910 from atm-john/new/unit_type_selection_limit 
NEW unit selection on object edit line
 2021-01-07 10:33:07 +01:00
Laurent Destailleur
c2855d4d71
Update html.form.class.php 2021-01-07 10:32:23 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-06 21:05:59 +01:00
ATM john
dd19da66b2 fix stickler 2021-01-06 17:33:19 +01:00
ATM john
ae7b8e7f5e Fix unit selection on object edit line 2021-01-06 15:15:51 +01:00
Regis Houssin
f80a476bc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-06 11:37:56 +01:00
kamel
32109de67b NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked() 2021-01-06 11:14:13 +01:00
Florian HENRY
6e7172887a Merge branch '13_backport' into dev_add_column_propal_order 2021-01-05 22:58:00 +01:00
Florian HENRY
b9bb48a01f better place and noadmininfo 2021-01-05 22:50:54 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
Florian HENRY
f953ff0334 fix sticker 2021-01-05 15:25:47 +01:00
Florian HENRY
a2a45c6aa0 fix sticker 2021-01-05 15:22:31 +01:00
Florian HENRY
27c32560c6 Merge develop 2021-01-05 14:46:50 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
Laurent Destailleur
7efd8add39
Merge pull request #15878 from frederic34/patch-10 
doxygen
 2021-01-05 01:41:02 +01:00
Frédéric FRANCE
eeaac549e2
doxygen 2021-01-05 00:11:19 +01:00
Frédéric FRANCE
c468db5a7c
doxygen 2021-01-04 23:41:20 +01:00
Florian HENRY
86075a4db9 review code 2021-01-04 20:00:57 +01:00
Florian HENRY
88ff52a82b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-04 19:20:34 +01:00
Frédéric FRANCE
8454100e7a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-04 17:45:36 +01:00
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Laurent Destailleur
b3142c3250
Merge pull request #15859 from frederic34/htmlformmail_doxygen 
doxygen
 2021-01-04 14:08:51 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Frédéric FRANCE
5dd0b3b1c6
can add box on user home page 2021-01-02 20:20:22 +01:00
Frédéric FRANCE
6fad38db57
can add box on member index page 2021-01-02 20:04:40 +01:00
Florian HENRY
b6d91526ee Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-02 17:58:34 +01:00
Regis Houssin
3b7f5a92cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 17:20:24 +01:00
Frédéric FRANCE
eb937f82c8
doxygen 2021-01-02 16:58:05 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Frédéric FRANCE
b71e837ddd
clean code 2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221
clean code 2021-01-02 10:17:11 +01:00
Frédéric FRANCE
5e692fa9db
doxygen 2021-01-02 09:47:29 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Laurent Destailleur
0241817217 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 21:12:36 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Regis Houssin
07dc29166e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-30 13:56:50 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2 
NEW: Dictionary for availability - Add column position
 2020-12-30 13:12:27 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +01:00
Regis Houssin
7832fa213f FIX Stickler line exceeds 500 characters; contains 527 characters 2020-12-30 11:34:59 +01:00
Regis Houssin
7c5248d105 FIX and the world turn again 2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Regis Houssin
6e0832fb38 FIX WIP avoid warning with php 8.0 2020-12-29 15:59:39 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Florian HENRY
1e438b686e fix stickler 2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10 
NEW add db fields note_public note_private for ecm
 2020-12-27 15:07:51 +01:00
Florian HENRY
1b6a4fc4ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction 2020-12-24 15:00:15 +01:00
Laurent Destailleur
5ef3ffbdc6 Fix warning 2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Florian HENRY
311a555cc0 Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2020-12-22 12:52:14 +01:00
Florian HENRY
fefc9040ab NEW : Display extrafields (for lines/det into line tr instead of ugly other tr 2020-12-22 12:52:01 +01:00
Florian Mortgat
64a62bf2c2 FIX (PR #15346 comment) use dol_mktime, not mktime 2020-12-22 09:37:30 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications 
simplify notications class
 2020-12-21 18:14:04 +01:00
Laurent Destailleur
7d0e71165a Clean code 2020-12-21 14:40:27 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Frédéric FRANCE
b7b35f4cd4
simplify notications class 2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab Fix buttond not working 2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d Fix API to get country 2020-12-19 22:34:33 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
05cb2653f3
Merge pull request #15749 from StephaneLesage/companycard-directedit-type 
Direct edition of type of company in card
 2020-12-15 13:54:06 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
f2a4f880ca Fix warning 2020-12-15 10:49:07 +01:00
David Bensel
bc9f7c83f4 update 2020-12-14 22:40:47 +03:00