Commit Graph

8056 Commits

Author SHA1 Message Date
andreubisquerra
5707bf0d73
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label 2020-04-06 19:38:50 +02:00
Laurent Destailleur
41b2ed8f89 Look and feel v12 2020-04-06 12:03:37 +02:00
Laurent Destailleur
81f289619d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 15:47:46 +02:00
Laurent Destailleur
ed4aa55857 Doxygen 2020-04-05 15:46:10 +02:00
Laurent Destailleur
233a7f1022 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 12:24:27 +02:00
Laurent Destailleur
bfbc9b303a Fix phpcs 2020-04-05 12:23:16 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2020-04-05 04:03:53 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
2020-04-05 02:54:41 +02:00
Laurent Destailleur
a41f54c82f Fix css 2020-04-05 02:39:40 +02:00
Laurent Destailleur
647d09050b Clean not required vars 2020-04-04 19:25:36 +02:00
atm-lena
bc0d98b91c FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation 2020-04-03 14:24:59 +02:00
Laurent Destailleur
87d46c4e86
Merge pull request #13473 from nervo/patch-1
NEW [Allow constants values to be overridden by environment variables]
2020-04-02 13:33:47 +02:00
Laurent Destailleur
9f55918cb8 Remove Geoipv1 library. We use now v2 2020-04-02 12:37:21 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
f6b216eafc Fix travis 2020-04-01 23:32:44 +02:00
Laurent Destailleur
6aea67a5b9 Work on extralanguages 2020-04-01 23:15:53 +02:00
stickler-ci
cf3615aee3 Fixing style errors. 2020-04-01 20:11:18 +00:00
nervo
abd6465190
Allow constants values to be overridden by environment variables 2020-04-01 22:02:34 +02:00
Laurent Destailleur
d2de6a22eb WIP Can set values in extra languages 2020-04-01 18:11:28 +02:00
Laurent Destailleur
33d2b61c19 Work on extralanguages 2020-04-01 16:21:03 +02:00
Laurent Destailleur
e75e49426f Look and feel v12 2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b7b97ec34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
4220236aa8
Merge pull request #13425 from andreubisquerra/develop
NEW: CUPS printing compatibility for TakePOS
2020-03-30 18:56:14 +02:00
oscim
d760b6618d
Fix use correctly hosts in connection
cf https://github.com/Dolibarr/dolibarr/issues/9426
2020-03-30 18:27:18 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
4ed4644c08 Work on generic multilanguage properties 2020-03-29 04:28:23 +02:00
Laurent Destailleur
d5b107211f Look and feel v12 2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944 Move more icon definition into CSS 2020-03-28 13:38:25 +01:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
9379f6fa9d Fix duplicate tooltip 2020-03-26 20:27:49 +01:00
Laurent Destailleur
a02e3e1e61 Fix duplicate tooltip 2020-03-26 20:05:17 +01:00
Laurent Destailleur
4a012c13b2 FIX Translation of tooltips of extrafields 2020-03-26 19:47:28 +01:00
Laurent Destailleur
2f94db6ffe FIX Translation of tooltips of extrafields 2020-03-26 19:46:36 +01:00
Laurent Destailleur
5a5863f46a FIX Group by invalid with pgsql 2020-03-26 03:55:34 +01:00
Laurent Destailleur
fa3bba942f Start to save the VAT src code into table of discounts to reuse them
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
ab19bb2455 FIX default value of selectMasssAction broken 2020-03-26 01:25:05 +01:00
Laurent Destailleur
90e0ead953 FIX default value of selectMasssAction broken 2020-03-26 00:52:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS 2020-03-25 21:30:33 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
7c819a96d5
Merge pull request #13415 from ptibogxiv/patch-314
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
2020-03-25 18:32:57 +01:00
Laurent Destailleur
0a92dcc5e6
Merge pull request #13413 from atm-florian/develop
fix extrafield creation with empty printable
2020-03-25 18:31:28 +01:00
Laurent Destailleur
925554d15e More accurate result 2020-03-25 18:27:53 +01:00
Laurent Destailleur
3855ef6073 Add rounding code 'CR' (currency rate' 2020-03-25 17:41:39 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +01:00
ptibogxiv
06f53fdd69
Update html.form.class.php 2020-03-24 17:32:50 +01:00
ptibogxiv
8409f3ba4e
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
for some business, products have same label so we sometimes need display origin of product for a good choice
2020-03-24 17:28:12 +01:00
florian HENRY
21febcc8fc fix extrafeild creation 2020-03-24 16:09:18 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26 FIX #13300 2020-03-22 20:50:50 +01:00
Laurent Destailleur
6f3cbe69e8 Fix phpcs 2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639 WIP Edit fields into alternate language 2020-03-22 19:11:21 +01:00
Laurent Destailleur
0574e1df9f
Merge pull request #13386 from aspangaro/12.0_a24
FIX: Load the translation file for extrafields
2020-03-20 10:05:41 +01:00
Laurent Destailleur
5ffc57f3f0
Update extrafields.class.php 2020-03-20 10:05:08 +01:00
Laurent Destailleur
03b261d54c Provide information of thirdparty, contact or project to SMS handler 2020-03-19 19:11:34 +01:00
Alexandre SPANGARO
a6227aeb6a FIX: Load the translation file for extrafields 2020-03-19 11:53:42 +01:00
Laurent Destailleur
fca6d45baa NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
instead.
2020-03-19 10:15:34 +01:00
Laurent Destailleur
c94c33696a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-19 09:58:04 +01:00
Laurent Destailleur
d38c6616e6 Doc 2020-03-19 09:53:20 +01:00
Laurent Destailleur
21de447d9e
Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility
NEW "contact_civility" for ODT templates
2020-03-18 19:31:10 +01:00
Laurent Destailleur
2c3bd78095
Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep
new : Add hook on select user or sales rep
2020-03-18 18:56:56 +01:00
Laurent Destailleur
3b1c02ae46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-18 18:51:05 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
e639e24993
Merge pull request #13352 from aspangaro/12.0_a22
FIX Update fiscalyear.class.php to filter on entity
2020-03-18 18:19:02 +01:00
Laurent Destailleur
94750ed350 css 2020-03-17 01:31:48 +01:00
Alexandre SPANGARO
6b168428d8 Merge remote-tracking branch 'upstream/develop' into 12.0_a22 2020-03-16 12:11:01 +01:00
florian HENRY
ef83801a53 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep 2020-03-16 11:53:49 +01:00
florian HENRY
117ff5f4eb add hook to add sql filter in where clause on select users 2020-03-16 11:49:03 +01:00
Alexandre SPANGARO
301b97f6d2 FIX Update fiscalyear.class.php to filter on entity 2020-03-16 10:05:22 +01:00
Tobias Sekan
c50f2b32d8
Add substitution for "user_civility" for ODT 2020-03-16 07:58:44 +01:00
Laurent Destailleur
22e8fdb46b Enhance #13033 2020-03-15 13:57:31 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
0d2d2302d5 Removed not relevant graph on stats on project 2020-03-14 03:18:49 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
99669583d5 Fix phpcs 2020-03-13 16:46:07 +01:00
Laurent Destailleur
d90bf25351 Fix phpcs 2020-03-13 13:11:04 +01:00
Laurent Destailleur
893ae21d3a Fix phpcs 2020-03-13 11:29:27 +01:00
Laurent Destailleur
6dda972ff5 Doxygen 2020-03-13 04:12:42 +01:00
Laurent Destailleur
94589158c0 Move class from external project as internal class (project is dead) 2020-03-13 02:32:33 +01:00
Laurent Destailleur
967d4223c6 FIX #13277 2020-03-12 16:15:48 +01:00
simicar29
4f4b778c8c
update_price: add invoice_supplier element name
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
2020-03-12 12:53:17 +01:00
stickler-ci
aaf1081f17 Fixing style errors. 2020-03-12 11:46:41 +00:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
c1e5178eeb Doc 2020-03-12 12:01:40 +01:00
Laurent Destailleur
d6a35db754 Look and feel v12 2020-03-12 11:13:50 +01:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
21dbddac76
Merge pull request #13317 from TobiasSekan/FixErrorOnAddLineToOrder
FIX Error on add a new line to a supplier order (with ODT templates)
2020-03-11 16:58:44 +01:00
Laurent Destailleur
2b8a06cb5e FIX unit price for selected supplier products not set. NaN was used. 2020-03-11 16:12:34 +01:00
Laurent Destailleur
5adec1fe32 FIX unit price for selected supplier products not set. NaN was used. 2020-03-11 16:11:38 +01:00
Laurent Destailleur
1f5c8f682c FIX cols parameter not propagated to tpl 2020-03-10 21:55:29 +01:00
Laurent Destailleur
d956222e36 FIX cols parameter not propagated to tpl 2020-03-10 21:54:50 +01:00
Tobias Sekan
60944c92a8
Fix error on add a line to a supplier order 2020-03-10 09:02:38 +01:00
Laurent Destailleur
cc1a02f0ea Support of null values in graph 2020-03-09 22:52:30 +01:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Laurent Destailleur
86f6736a18 Fix phpcs 2020-03-09 18:55:47 +01:00
Laurent Destailleur
ca4c62be56 Fix var init 2020-03-09 13:56:25 +01:00
Laurent Destailleur
067759bf04 Fix graph for lines 2020-03-08 20:22:46 +01:00
Laurent Destailleur
343a80fd3d Fix table fields 2020-03-08 19:25:00 +01:00
Laurent Destailleur
6424e50ba4 Enhance of colors in graph 2020-03-07 16:45:28 +01:00
Laurent Destailleur
e6f68b9a29 Fix correct 'group by' when content is '0', '' or null 2020-03-06 20:02:05 +01:00
Jean Traullé
7c2bed2846 Fix #13296 2020-03-06 16:22:41 +00:00
Laurent Destailleur
d812249047 Move code into functions 2020-03-06 17:13:51 +01:00
Laurent Destailleur
cdec58a527 Clean old code 2020-03-06 15:05:18 +01:00
Laurent Destailleur
d0f22c7bff Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contrat/list.php
	htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
0b8adbfc55
Merge pull request #13289 from atm-greg/Fix_countable_warning_on_homescreen
fix countable warning on home screen
2020-03-06 14:13:24 +01:00
Laurent Destailleur
ad9d0a3472 Fix graph of product distribution when too much record 2020-03-06 12:45:02 +01:00
Laurent Destailleur
e2396919d4 FIX chart of product distribution 2020-03-06 11:52:32 +01:00
atm-greg
eafff58a54 fix countable warning 2020-03-06 11:30:45 +01:00
Laurent Destailleur
c27f90958e Code comment 2020-03-06 11:06:07 +01:00
Laurent Destailleur
4c6a4ade5b Log 2020-03-06 11:02:40 +01:00
Laurent Destailleur
ea658ebe72 Fix setShowLegend with chartjs 2020-03-06 09:51:30 +01:00
Laurent Destailleur
f9546fc50e Fix dolgraph 2020-03-06 09:21:04 +01:00
Laurent Destailleur
32ee3122ac More accurate code 2020-03-06 02:24:24 +01:00
Laurent Destailleur
0ba2c53b02 Fix translation of graph 2020-03-06 01:42:42 +01:00
Laurent Destailleur
7b5f9e1b11 Fix graph 2020-03-06 01:29:59 +01:00
Laurent Destailleur
52c236570b Work on the generic Graphic Reporting tool 2020-03-06 01:18:35 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f NEW Add graph type 'piesemicircle' 2020-03-05 16:30:55 +01:00
kamel
0123fa7696 FIX subsitute lines dates values on doc generator (ODT, ...) 2020-03-05 15:37:01 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
74fa8d90e7 Use status of member colors into pie chart 2020-03-05 01:38:41 +01:00
Laurent Destailleur
a98b65ad99 FIX #13274 cannot add or update 0 value for an int or double extrafield
type
2020-03-05 00:43:51 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
d0839350db NEW Move engine to build charts from jflot to chart.js 2020-03-04 23:30:41 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
760afd6838 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e No more need fo this constant. Use the generic default feature instead 2020-03-02 23:28:01 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
6d01aee2f2
Merge pull request #13246 from Dolibarr/11.0
Can process lang files with windows format (even if all lang files must have linux format)
2020-03-02 21:46:27 +01:00
Sekan, Tobias
f325c63055 Merge branch 'NewCategoriesInStocks' of https://github.com/TobiasSekan/dolibarr into NewCategoriesInStocks 2020-03-01 14:50:27 +01:00
Sekan, Tobias
754058b990 Fix lint errors 2020-03-01 14:50:22 +01:00
stickler-ci
a6b2531fd0 Fixing style errors. 2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e adress feedback 2020-03-01 14:45:51 +01:00
Laurent Destailleur
bb5b55f9e3
Merge pull request #13225 from prietojc/patch-13
Update translate.class.php
2020-02-29 12:58:32 +01:00
Laurent Destailleur
00483e4e85 NEW Add hook getInputIdProf. Better solution for #13228 2020-02-29 12:32:27 +01:00
Laurent Destailleur
dea8525a6c NEW X-Axis on graph are show vertical when there is a lot of values. 2020-02-29 01:26:24 +01:00
Laurent Destailleur
f0d458682d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f Fix error when generating documents 2020-02-29 00:13:42 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Laurent Destailleur
e07a29ecd0 Fix class not found 2020-02-27 22:02:45 +01:00
Laurent Destailleur
2d841d9d83 Debug multilang website 2020-02-27 21:43:11 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Laurent Destailleur
baaa6b797b FIX SQl syntax error 2020-02-27 17:51:31 +01:00
Laurent Destailleur
a0b465e8ae Fix sql error 2020-02-27 17:43:59 +01:00
Laurent Destailleur
eac07aceb0 Responsive 2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
6d728f12ba NEW: invoice list: enable multicurrency columns 2020-02-27 14:10:00 +01:00
JC Prieto
c555a2c588
Update translate.class.php
Resolve bug #9105
When load() function loads translation file from an external modules, adds a \r simbol at the end of each line.
2020-02-27 09:32:22 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ab01acfe53
Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 16:30:20 +01:00
Laurent Destailleur
b52cfe58d6 FIX Disable js if no javascript 2020-02-26 15:45:12 +01:00
Laurent Destailleur
35e886fb12 FIX Disable js if no javascript 2020-02-26 15:22:23 +01:00
Marc de Lima Lucio
d3b70994fe Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice 2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01 FIX: excess paid from situation invoices not counted when calculating remain to pay 2020-02-26 10:35:43 +01:00
Laurent Destailleur
b7b2d3562b
Merge pull request #13195 from oscim/patch-24
Update commonobject.class.php
2020-02-26 05:14:27 +01:00
Laurent Destailleur
59137f0f47
Merge pull request #13190 from oscim/patch-23
Update commonobject.class.php
2020-02-25 12:05:22 +01:00
ATM john
c216b7cae5 fix title padding definition source 2020-02-24 22:34:34 +01:00
ATM john
7b6faf7063 Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-24 22:16:10 +01:00
ATM john
9c1fdf1c52 Fix missing php doc 2020-02-24 22:12:36 +01:00
stickler-ci
5a77716b93 Fixing style errors. 2020-02-24 21:10:14 +00:00
ATM john
3e492b8a5b Fix title padding 2020-02-24 22:08:04 +01:00
ATM john
ae890d021c Fix comments 2020-02-24 21:50:01 +01:00
ATM john
7f2dd19bb0 Fix pdf cell padding for model cyan, erathosthene, espadon, cornas 2020-02-24 21:43:33 +01:00
stickler-ci
6de74e774e Fixing style errors. 2020-02-24 19:50:07 +00:00
ATM john
3c4e7f7b07 Fix cell padding sponge 2020-02-24 20:47:19 +01:00
oscim
65f3e5466e
Update commonobject.class.php
add path class for support type project or projet in element_element
2020-02-24 17:51:11 +01:00
stickler-ci
d07e2ab8fb Fixing style errors. 2020-02-24 16:44:46 +00:00
oscim
fe4bd46c43
Update commonobject.class.php
add support of contact linkedobject
2020-02-24 17:28:25 +01:00
Tobias Sekan
7baba2ba43
Add line number substitution 2020-02-24 14:55:02 +01:00
John Botella
06b2d459c0 Fix cell padding 2020-02-24 14:18:49 +01:00
oscim
6c7a534018
Update commonobject.class.php
Add support of project/projet in objectlinked
2020-02-24 11:49:12 +01:00
ATM john
41c18a7884 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-24 00:01:50 +01:00
Laurent Destailleur
096a568e83 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
stickler-ci
fab34d5114 Fixing style errors. 2020-02-23 22:40:41 +00:00
ATM john
0c2d08cdd9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-23 23:36:43 +01:00
Laurent Destailleur
ee45c3efb6 FIX #13184 2020-02-23 23:29:13 +01:00
ATM john
acacbfd85e Fix list separator on first loop 2020-02-23 23:17:10 +01:00
ATM john
316fa4068a revert commit fdfc45bbe9 and fix y position 2020-02-23 23:14:01 +01:00
ATM john
5ecef88b35 allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields 2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7 Rename field documentpdf into printable (this field already exists due
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
Laurent Destailleur
90565e4637
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
NEW allow display extrafields on pdf
2020-02-23 22:55:16 +01:00
Laurent Destailleur
cac61c223d
Merge pull request #13176 from andreubisquerra/master
Add orders to Receipt Printer module
2020-02-23 22:44:14 +01:00
Laurent Destailleur
76e33058a8 NEW Can select several fields to personalize list before submit. 2020-02-23 21:38:24 +01:00
ATM john
f611e4fc0e Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf 2020-02-23 20:53:50 +01:00
ATM john
07bd6e1fc0 Fix On admin page add extrafields form, display on pdf option doesn't saved 2020-02-23 20:52:44 +01:00
stickler-ci
222a000d31 Fixing style errors. 2020-02-23 14:27:22 +00:00
ATM john
8a279ed124 improve extrafields display in notes 2020-02-23 15:24:59 +01:00
ATM john
679e2fd186 Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf 2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139 Add new params to extrafields forms to allow extrafields to be displayed on pdf documents 2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80 Fixing style errors. 2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee fix extrafield conf cache 2020-02-23 10:09:47 +01:00
stickler-ci
281e059487 Fixing style errors. 2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8 add extrafields in notes 2020-02-23 02:26:21 +01:00
stickler-ci
2b027cfebf Fixing style errors. 2020-02-22 15:45:39 +00:00
ATM john
e209fd2973 Add extrafields on PDF object lines 2020-02-22 16:27:44 +01:00
javierybar
fddcc844ff Add orders to Receipt Printers module 2020-02-22 11:30:48 +01:00