2
0
forked from Wavyzz/dolibarr
Commit Graph

24418 Commits

Author SHA1 Message Date
Philippe GRAND
ee50cee862 standardization, internationalisation 2021-02-09 14:07:58 +01:00
Philippe GRAND
a50ecdd1aa standardization, internationalisation 2021-02-09 14:06:55 +01:00
Philippe GRAND
fff2c1fbac standardization, internationalisation 2021-02-09 14:06:22 +01:00
Philippe GRAND
4840fa8214 standardization, internationalisation 2021-02-09 14:05:19 +01:00
Philippe GRAND
858ebf5aaf standardization, internationalisation 2021-02-09 14:04:38 +01:00
Philippe GRAND
a8b72c98a2 standardization, internationalisation 2021-02-09 14:03:13 +01:00
Philippe GRAND
ff0c105207 standardization, internationalisation 2021-02-09 14:01:50 +01:00
Philippe GRAND
55dd15cbf6 standardization, internationalisation 2021-02-09 14:01:10 +01:00
Philippe GRAND
11053fe0ed standardization, internationalisation 2021-02-09 14:00:26 +01:00
Philippe GRAND
39c3bcd265 standardization, internationalisation 2021-02-09 13:58:26 +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
Laurent Destailleur
89bda722bf Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
2021-02-09 13:29:40 +01:00
Laurent Destailleur
5e9065390a Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl
NEW:add hidden option to auto load input line extrafield into new lines
2021-02-09 13:24:53 +01:00
Laurent Destailleur
3b0268424b Merge pull request #16227 from grandoc/new_branch_08_02_2021
Save the name of generated file as the main doc when generating a doc…
2021-02-09 13:24:02 +01:00
Laurent Destailleur
a5386246cd Merge pull request #16225 from frederic34/facturerec
clean deprecated modelpdf to model_pdf
2021-02-09 13:23:25 +01:00
Frédéric FRANCE
04c25a01af deprecate non camelCaps functions 2021-02-09 13:10:11 +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
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
2021-02-08 22:13:50 +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
Laurent Destailleur
5966e63120 Fix css 2021-02-08 20:01:10 +01:00
Florian HENRY
1e6144a99d fix indent 2021-02-08 19:59:18 +01:00
Laurent Destailleur
af4d3767ea css 2021-02-08 19:56:38 +01:00
Florian HENRY
b6b736c402 NEW:add hidden option to auto load input line extrafield into new lines 2021-02-08 19:56:34 +01:00
Philippe GRAND
f27dd77cb6 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:47:31 +01:00
Philippe GRAND
62d6666927 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:46:09 +01:00
Philippe GRAND
d9eb727c0f Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:44:46 +01:00
Philippe GRAND
f80da203e0 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:43:36 +01:00
Philippe GRAND
6b0bb90ab2 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:40:27 +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
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
2021-02-08 17:25:05 +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
25823d7b90 Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY
Add hidden conf to display supplier in object lines
2021-02-08 16:58:28 +01:00
Laurent Destailleur
c33fb4badc Merge pull request #16219 from FHenry/dev_fix_continue
Add extrafileld value into return ajax
2021-02-08 16:57:03 +01:00
Florian HENRY
cb152b22df fix ajax 2021-02-08 15:47:37 +01:00
Laurent Destailleur
8041ef641a Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Laurent Destailleur
2440c11eec Merge pull request #16214 from FHenry/dev_fix_continue
Various fix in dev branch
2021-02-08 15:11:32 +01:00
Laurent Destailleur
fe9d23e90b Update functions.lib.php 2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05 Update functions.lib.php 2021-02-08 15:10:07 +01:00
Laurent Destailleur
7526bef3f8 Merge pull request #16211 from frederic34/patch-2
Update functions.lib.php
2021-02-08 15:08:46 +01:00
Laurent Destailleur
d0bbf5bf35 Update functions.lib.php 2021-02-08 15:08:24 +01:00
Laurent Destailleur
5c64173bfa Merge pull request #16209 from frederic34/barcodepicto
add barcode picto in left menu
2021-02-08 15:04:56 +01:00
Laurent Destailleur
026e454825 Merge pull request #16208 from frederic34/ecmpicto
add ecm picto in left menu
2021-02-08 15:04:42 +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
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00