Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 18:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

9249 Commits

Author SHA1 Message Date
Laurent Destailleur
9c1d76aaaa Merge pull request #16294 from frederic34/patch-3 
define variable for all execution paths
 2021-02-15 15:53:12 +01:00
Laurent Destailleur
7e7d393f30 Look and feel v14 2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
1b69456216 Complete response 2021-02-15 13:00:21 +01:00
Florian HENRY
e1f503a8cf Merge branch 'develop' into dev_EventOrganisation 2021-02-15 11:19:08 +01:00
Frédéric FRANCE
382123b64a define variable for all execution paths 
The variable $filelog does not seem to be defined for all execution paths leading up to this point.
 2021-02-15 08:36:40 +01:00
Laurent Destailleur
25230fb4bb Merge pull request #16284 from andreubisquerra/develop 
Improve logo printing compatibility with TakePOS connector
 2021-02-14 21:41:45 +01:00
Laurent Destailleur
2cc4632a39 Fix js error 2021-02-14 21:32:19 +01:00
Laurent Destailleur
66c7770146 Factorize some common code for type of event 2021-02-14 20:12:43 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
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