Commit Graph

19772 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
atm-quentin
009eb0d4a4 FIX test on 0 better than isset 2020-02-27 09:34:20 +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
9c1c0ee08f Fix for nojs interface 2020-02-26 16:17:31 +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
atm-quentin
a5baf2bc88 FIX search with '0' 2020-02-26 09:19:39 +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
39624f21e7 Fix var not always defined 2020-02-25 15:36:34 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
61abfb95a5 Look and feel v12 2020-02-25 13:28:11 +01:00
Laurent Destailleur
16b3e6f7bb Move external access on dedicated tab
Translate field to sort products
2020-02-25 12:44:18 +01:00
Laurent Destailleur
ace5f2844a Make Setup of TakePOS faster with Ajax ON-Off Button. 2020-02-25 12:37:44 +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
Laurent Destailleur
75cddcd2de Merge pull request #13193 from TobiasSekan/NewLinePosOdtTemplate
NEW Support of tag {line_pos} for line numbers for tables in ODT templates
2020-02-25 00:05:01 +01:00
Laurent Destailleur
2a6652f6b5 Merge pull request #13192 from atm-florian/11_fixcomumnRUMMissingintoImport
fix missing column into Bank import
2020-02-24 22:55:47 +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
Laurent Destailleur
d78221ea08 css 2020-02-24 21:48:46 +01:00
Laurent Destailleur
7cd49f327e Look and feel v12: CSS for qty in lists 2020-02-24 21:47:48 +01:00
ATM john
7f2dd19bb0 Fix pdf cell padding for model cyan, erathosthene, espadon, cornas 2020-02-24 21:43:33 +01:00
Laurent Destailleur
68526a14cd NEW Truncate columns names when too long and show full title as popup 2020-02-24 21:33:28 +01:00
Laurent Destailleur
32d74adf20 NEW Truncate columns names when too long and show full title as popup 2020-02-24 21:18:49 +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
Laurent Destailleur
9d9429f66b New: Can limit number of tabs by page. 2020-02-24 20:41:29 +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
John Botella
11b6cae4f1 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 17:48:42 +01:00
John Botella
1ca1f0677b fix PDF cell padding 2020-02-24 17:48:01 +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
florian HENRY
9f8166ed37 fix missing column into import 2020-02-24 15:14:01 +01:00
florian HENRY
b2b2291117 fix missing column into import 2020-02-24 15:12:26 +01:00
florian HENRY
2c26ddb22b fix missing column into import 2020-02-24 15:11:14 +01:00
Tobias Sekan
2d9300cedb Add position to ODT supplier_proposal template 2020-02-24 15:06:21 +01:00
Tobias Sekan
fc76586e2f Add position to ODT supplier order template 2020-02-24 15:05:04 +01:00