Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
88,807 Commits 36 Branches 189 Tags
8adf1852b1cf968db61fbf140f15be50dccf8fb1
Commit Graph

1970 Commits

Author SHA1 Message Date
Laurent Destailleur
8adf1852b1 Clean code 2020-08-30 03:00:35 +02:00
Laurent Destailleur
9cba23e458 Fix phpcs 2020-08-29 06:10:18 +02:00
Laurent Destailleur
bca9a84710 Enhance autofill of end date when creating an event 2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
bd201052de Update html.form.class.php 2020-08-29 04:58:07 +02:00
Laurent Destailleur
ca47eb2c9f Update html.form.class.php 2020-08-29 04:55:24 +02:00
Laurent Destailleur
0b8d7f329e FIX added information on user list not visible with multiselect 2020-08-28 17:17:22 +02:00
Laurent Destailleur
fe4acf4e4e NEW Add focus when editing on product/stock/product.php Close #14548 2020-08-27 21:18:40 +02:00
atm-lena
c10556473f Clean 2020-08-26 15:35:12 +02:00
atm-lena
d4e6a9871c Update select_type_duration() function 2020-08-26 15:14:07 +02:00
atm-lena
a4018f41f7 WIP 2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed Add "select_model_mail" function + add select to create event 2020-08-25 17:26:32 +02:00
atm-lena
25840c2b3d Create Event - Add fields 2020-08-25 12:40:29 +02:00
Laurent Destailleur
03af14294a Standardize code. Debug module HRM 2020-08-22 15:29:19 +02:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00
Laurent Destailleur
00804c1020 Complete fix for #14146 2020-08-07 15:19:26 +02:00
Laurent Destailleur
284378232b Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam 
FIX :  JS CRASH - bad usage of moreparam
 2020-08-07 10:10:09 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
1edfa4a4fb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-08-02 16:01:03 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Francis Appels
54410189bc Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO 
When product ajax search used a dash is show, so virtual stock looks like being negative value.
 2020-07-29 17:00:39 +02:00
Laurent Destailleur
b63a6bc72a NEW Can use dynamic code into the 'enabled' property of DAO fields 2020-07-26 20:45:54 +02:00
quentin
39651953b3 FIX refacto 2020-07-01 14:04:41 +02:00
quentin
267aa7605b Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab 2020-07-01 14:00:49 +02:00
Laurent Destailleur
a3ae7a76b8 WIP Stock at date 2020-06-28 19:35:24 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
d6346522b8 Code comment 2020-06-26 19:36:15 +02:00
Laurent Destailleur
b0d46d0c4c Code comment 2020-06-26 18:56:05 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
9ec8051a37 NEW Add param to not show links when output tags 2020-06-16 02:56:48 +02:00
Laurent Destailleur
012574b487 Update html.form.class.php 2020-06-12 00:51:19 +02:00
DEMAREST Maxime (Indelog)
1ac341e651 Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list 2020-06-09 15:33:10 +02:00
atm-quentin
3dd7c81f54 FIX stickler 2020-06-08 15:58:20 +02:00
atm-quentin
69db790cf5 NEW multiselect type and date to date filter 2020-06-08 14:43:14 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Alexandre SPANGARO
ede084a111 Fix stickler 2020-06-04 05:11:00 +02:00
Alexandre SPANGARO
9e5c7d0acf FIX: Show ref_customer, amount on contract link object 2020-06-03 23:00:53 +02:00
Laurent Destailleur
a37a4031e9 FIX Delete of website page need permission. Conflict with mass action. 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1 FIX Delete of website page need permission. Conflict with mass action. 2020-06-03 00:46:09 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
ptibogxiv
a33f503a0d FIX php error 
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
 2020-05-31 14:28:41 +02:00