Commit Graph

74252 Commits

Author SHA1 Message Date
Laurent Destailleur
92d6661483 Fix trans 2020-03-05 21:59:44 +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
Tobias Sekan
a155409bc2
Add sorting for project overview columns 2020-03-05 14:16:56 +01:00
Laurent Destailleur
2da459c561 Fix theme 2020-03-05 12:44:09 +01:00
Tim Otte
1472a24371 Added missing line break replacement when the values do not contain html tags 2020-03-05 09:41:22 +01:00
Laurent Destailleur
5a22fb11ef css 2020-03-05 03:23:54 +01:00
Laurent Destailleur
85c1e2a670 Fix regression css 2020-03-05 03:20:06 +01:00
Laurent Destailleur
1a9506150e NEW Can filter on donation status in list 2020-03-05 03:04:53 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
f35f0ecf9d Look and feel v12 2020-03-05 01:54:12 +01:00
Laurent Destailleur
45bcd1c3bf Code simpler 2020-03-05 01:50:53 +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
c2e5830f9b Fix phpcs 2020-03-05 00:22:51 +01:00
Laurent Destailleur
a5a2d60755 Fix phpcs 2020-03-05 00:20:39 +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
0766097658 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-04 19:28:24 +01:00
Laurent Destailleur
a6d340a22c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Christian Foellmann
55dc3d36ac fix broken categories on "contacts" tab of project 2020-03-04 19:25:48 +01:00
Laurent Destailleur
4a77505032
Merge pull request #13278 from cfoellmann/fix-missing-lang-usage
add missing translation string "Usage" (projects)
2020-03-04 19:25:19 +01:00
Laurent Destailleur
deda6252f2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/class/expensereport.class.php
2020-03-04 19:22:30 +01:00
Laurent Destailleur
f92dc4399d
Merge pull request #13276 from cfoellmann/fix-project-contacts-cat
fix broken categories on "contacts" tab of project
2020-03-04 19:18:11 +01:00
Laurent Destailleur
e2162a7b33
Merge pull request #13275 from TobiasSekan/NewSortingForContactsOf
NEW Add sorting for contacts of ... pages
2020-03-04 19:17:41 +01:00
Laurent Destailleur
f0e8325eb4
Merge pull request #13271 from FrederikHeinrich/patch-1
Fix
2020-03-04 19:13:15 +01:00
Christian Foellmann
b0f1af8433 add missing translation string "Usage" (projects) 2020-03-04 15:18:50 +01:00
Christian Foellmann
e052520882 fix broken categories on "contacts" tab of project 2020-03-04 14:50:10 +01:00
stickler-ci
92cc947623 Fixing style errors. 2020-03-04 12:41:52 +00:00
Laurent Destailleur
ddc0547eda Fix position of button 2020-03-04 13:31:19 +01:00
Tobias Sekan
f823feba52
Add sorting for "Contacts of ..." 2020-03-04 13:31:19 +01:00
atm-arnaud
834873ab15 FIX date order was -1D and desc with label repetition 2020-03-04 11:58:42 +01:00
Laurent Destailleur
50d76ae0e8 FIX Bad permission to access menu Statistics on intervention. 2020-03-04 11:51:32 +01:00
Laurent Destailleur
2b65dff8a2 FIX Bad permission to access menu Statistics on intervention. 2020-03-04 11:48:43 +01:00
Laurent Destailleur
c66b0fe383 css 2020-03-04 11:46:49 +01:00
Laurent Destailleur
47d13a27df NEW Upgrade ace to 1.4.8 - Upgrade select2 to 4.0.13 2020-03-04 11:43:48 +01:00
Freddi
96bbba0301
Update fichinter.class.php
adding ",'showoncombobox'=>1" for a better View
2020-03-04 10:20:28 +01:00
Laurent Destailleur
f586c3b0c8 Prepare 11.0.2 2020-03-04 10:13:55 +01:00
stickler-ci
e2f749b5ee Fixing style errors. 2020-03-04 09:10:29 +00:00
Freddi
b4ef25df71
Update fichinter.class.php 2020-03-04 10:09:48 +01:00
stickler-ci
47d632a394 Fixing style errors. 2020-03-04 09:05:20 +00:00
Freddi
f17763f400
Update fichinter.class.php 2020-03-04 10:02:02 +01:00
Tim Otte
6b3fdfbcd8 Moved the HtmlToOdtConverter class into the odf class 2020-03-04 08:54:49 +01:00
Laurent Destailleur
60eabb0e8a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-04 02:15:51 +01:00
Laurent Destailleur
f357661745 Fix PHPCS 2020-03-04 02:14:40 +01:00
Laurent Destailleur
24f416d0dd Fix default content of page 2020-03-04 02:03:29 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201 FIX #13263 2020-03-04 00:53:07 +01:00
Laurent Destailleur
109770f5c3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-04 00:38:53 +01:00
Laurent Destailleur
5f417039f6 More log to help debug 2020-03-04 00:38:43 +01:00
Laurent Destailleur
71f19b4e5e FIX #13267 2020-03-04 00:38:04 +01:00
Laurent Destailleur
70d4e5d7e3 Fix button should not be visible 2020-03-03 23:51:17 +01:00
Laurent Destailleur
1ee52d4c63 Enhancement of #13240 2020-03-03 23:19:05 +01:00
Laurent Destailleur
4f7da118d6
Merge pull request #13240 from AlexLudwigITDienstleistungen/patch-1
Resolve Error if dolibarr is running in docker container
2020-03-03 23:16:01 +01:00
Laurent Destailleur
537d129627
Merge pull request #13251 from bb2a/patch-20
NEW Add subtitution variables for url of document in backoffice
2020-03-03 23:13:53 +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
c80e37edf6
Merge pull request #13259 from ptibogxiv/patch-310
FIX:  fk_type subscription list via api REST
2020-03-03 23:11:47 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
Laurent Destailleur
6f3197bbea
Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder
Fix sql syntax error
2020-03-03 22:54:11 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312
FIX doc
2020-03-03 22:53:51 +01:00
Laurent Destailleur
d5546df57b Responsive 2020-03-03 22:50:37 +01:00
Laurent Destailleur
fd64f0fadb Fix responsive 2020-03-03 22:46:29 +01:00
Laurent Destailleur
88d2e13f02 Fix reponsive 2020-03-03 22:15:55 +01:00
Laurent Destailleur
2d64b8c2f9
Merge pull request #13261 from ptibogxiv/patch-311
NEW get proposal by ref with API
2020-03-03 21:45:17 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20
FIX: Nowrap on amount
2020-03-03 21:44:54 +01:00
Regis Houssin
945641a05b
FIX missing global $conf 2020-03-03 16:26:57 +01:00
Laurent Destailleur
730b8ed932 CSS 2020-03-03 16:09:33 +01:00
Laurent Destailleur
a22296ca72 Trans 2020-03-03 15:19:37 +01:00
Laurent Destailleur
b587ac6936 FIX responsive 2020-03-03 15:14:27 +01:00
Laurent Destailleur
be30667dbe FIX responsive 2020-03-03 15:13:55 +01:00
Laurent Destailleur
13fb5eda83 Fix for md theme 2020-03-03 15:11:14 +01:00
ptibogxiv
a71356f0ed
FIX doc 2020-03-03 13:41:19 +01:00
ptibogxiv
b6bad0c936
Update api_proposals.class.php 2020-03-03 13:40:26 +01:00
ptibogxiv
fa5aeebcd8
NEW get proposal by ref with API 2020-03-03 13:39:22 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
ptibogxiv
060df57cb1
FIX: fk_type subscription list via api REST
v10 to dev
2020-03-03 11:58:15 +01:00
atm-ph
e916ff40ff Fix sql syntax error 2020-03-03 11:55:05 +01:00
Marc de Lima Lucio
5f5824daaa FIX: order list: remove useless multicurrency lines 2020-03-03 10:43:23 +01:00
Tim Otte
667f00872c Fixed lint errors 2020-03-03 10:33:26 +01:00
stickler-ci
f026b959a2 Fixing style errors. 2020-03-03 09:28:00 +00:00
Tim Otte
8ce1f5f360 Fixed a few bugs
Added custom font-families
2020-03-03 10:19:05 +01:00
Marc de Lima Lucio
1735b22be9 NEW: supplier proposal list: enable multicurrency columns 2020-03-03 10:11:40 +01:00
Marc de Lima Lucio
b58608dab0 NEW: supplier order list: enable multicurrency columns 2020-03-03 09:56:25 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php 2020-03-03 09:53:00 +01:00
Marc de Lima Lucio
1c912659eb NEW: supplier invoice list: enable multicurrency columns 2020-03-03 09:38:05 +01:00
Alexandre SPANGARO
aeb3f70df7 FIX: Nowrap on amount 2020-03-03 07:26:51 +01:00
Alexandre SPANGARO
99b02fca47 Fix error 2020-03-03 05:18:45 +01:00
Alexandre SPANGARO
278dfce301 Fix not logical use 2020-03-03 05:16:14 +01:00
Alexandre SPANGARO
fbd7dc66b2 Fix error 2020-03-03 05:06:31 +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
799e795871
Merge pull request #13242 from javierybar/develop
NEW TakePOS numbering
2020-03-02 23:27:26 +01:00
javierybar
8776880a12
Update terminal.php 2020-03-02 22:51:06 +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
javierybar
4aced13dbf
Update terminal.php 2020-03-02 22:47:12 +01:00
javierybar
9d869587cc
Update setup.php 2020-03-02 22:39:56 +01:00
Laurent Destailleur
b9e5f349a1
Merge pull request #13249 from hregis/11.0_bug
FIX modFournisseur is required by modSupplierProposal
2020-03-02 22:01:39 +01:00
Laurent Destailleur
46bf65704a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Laurent Destailleur
b4dd5dd063 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 21:51:49 +01:00
Laurent Destailleur
5957f86b1e css for takepos and md theme 2020-03-02 21:51:13 +01:00
Laurent Destailleur
ea7c2aa46b
Update functions.lib.php 2020-03-02 21:47:36 +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
Laurent Destailleur
c47ddb8bca
Merge pull request #13245 from aspangaro/12.0_a19
NEW: Bookkeeping - Add link to document & pdf
2020-03-02 21:44:27 +01:00
Laurent Destailleur
c9d7ea8998
Merge pull request #13241 from ptibogxiv/patch-309
NEW: api invoice get by ref
2020-03-02 21:39:17 +01:00
Laurent Destailleur
389d25a588
Merge pull request #13243 from andreubisquerra/develop
Fix terminal popup in new TakePOS head bar
2020-03-02 21:29:38 +01:00
Laurent Destailleur
e9d0831cf8
Merge branch 'develop' into abb90064 2020-03-02 21:15:46 +01:00
Laurent Destailleur
7e2c2913bc
Update myobject.class.php 2020-03-02 21:13:02 +01:00
Laurent Destailleur
86f0d6db41
Update myobject.class.php 2020-03-02 21:06:57 +01:00
Laurent Destailleur
2ca5532a21
Update myobject.class.php 2020-03-02 21:03:59 +01:00
Laurent Destailleur
05556a77af Fix css 2020-03-02 19:37:16 +01:00
Anthony Berton
d9a002a8bd
Update functions.lib.php 2020-03-02 19:27:36 +01:00
Anthony Berton
197f81cb52
Update functions.lib.php 2020-03-02 19:23:45 +01:00
Anthony Berton
12b9897f5c
Update functions.lib.php 2020-03-02 18:53:52 +01:00
Laurent Destailleur
db96634339 Fix trans 2020-03-02 18:50:21 +01:00
Laurent Destailleur
91e8df5c9b Fix canonical name 2020-03-02 18:43:44 +01:00
Laurent Destailleur
390c0ce4dc Fix main language is not into subdir 2020-03-02 18:41:30 +01:00
Laurent Destailleur
fab39aef9e Clean menu bar 2020-03-02 17:35:49 +01:00
Laurent Destailleur
bb79c2cbd9 Fix links 2020-03-02 17:06:22 +01:00
Laurent Destailleur
dea1f1b19f Fix link 2020-03-02 17:00:51 +01:00
Laurent Destailleur
8928a84c53 Fix link to medias 2020-03-02 16:56:54 +01:00
Tim Otte
d5671f1c42 Fixed a few bugs 2020-03-02 16:08:06 +01:00
Laurent Destailleur
c8b51066e5 NEW Add due date in feature "Export accounting documents" 2020-03-02 16:00:07 +01:00
florian HENRY
dbb80aecd1 Fix line origin and Id when create order from 2020-03-02 15:22:35 +01:00
Regis Houssin
e962afb9c5 FIX modFournisseur is required by modSupplierProposal 2020-03-02 14:10:37 +01:00
Tim Otte
598d6d63b0 Added HtmlToOdtConverter class
Implemented the converter in the odf setVars() function
2020-03-02 10:18:38 +01:00
Alexandre SPANGARO
cdca4ca0aa NEW: Bookkeeping - Add link to document & pdf 2020-03-02 09:01:25 +01:00
Alexandre SPANGARO
be8ed42450 NEW: Bookkeeping - Add link to document & pdf 2020-03-01 23:17:40 +01:00
andreubisquerra
ba543896d4
Fix Terminal popup in new head barTakePOS 2020-03-01 21:19:48 +01:00
javierybar
a4b01e3025
Update invoice.php 2020-03-01 19:47:27 +01:00
javierybar
9fabc7de81
Update setup.php 2020-03-01 19:46:53 +01:00
javierybar
c9b6c89861
Update terminal.php 2020-03-01 19:46:21 +01:00
javierybar
e024ea2647
Update cashdesk.lang 2020-03-01 19:45:18 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php 2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php 2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6 Fixing style errors. 2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref 2020-03-01 18:33:13 +01:00
Alex Ludwig
6ad477a08c
Resolve Error if dolibarr is running in docker container
If dolibarr is running in docker containers with alpine-linux it will fail because it has wrong environment variables. This pull request resolve the issue. It was found by dolichicken in the german user forum: https://www.dolibarr.de/forum/howto-hilfe/52509-anleitung-odt-nach-pdf-konvertieren#57583
2020-03-01 17:14:31 +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
Alexandre SPANGARO
da99c89c26 FIX: typo on ckeck method 2020-03-01 05:21:51 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
8f3401896f Merge remote-tracking branch 'upstream/develop' into 12.0_a18 2020-03-01 05:06:52 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
06e428064f Fix CSS for md 2020-02-29 14:17:06 +01:00
Laurent Destailleur
786b13d09c css 2020-02-29 13:51:24 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +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
f0d2f33e38
Merge pull request #13231 from defrance/patch-148
FIX: checkbox fields not updated when unchecked
2020-02-29 12:54:25 +01:00
Laurent Destailleur
8879672122 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 12:52:18 +01:00
Laurent Destailleur
0855598c00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/lib/functions.lib.php
2020-02-29 12:51:33 +01:00
Laurent Destailleur
c3ab1055bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-29 12:48:40 +01:00
VESSILLER
8eff3162a9 FIX undefined function measuringUnitString in product list 2020-02-29 12:47:48 +01:00
Laurent Destailleur
9def29054d Fix compatibility account->bank_account 2020-02-29 12:46:52 +01:00
Laurent Destailleur
a6c7463c27
Merge pull request #13223 from TobiasSekan/FixCategoryStockCounter
Fix category stock counter
2020-02-29 12:38:21 +01:00
Laurent Destailleur
d6b5a84895
Merge pull request #13210 from atm-quentin/FIX_list_search_0
FIX search with '0'
2020-02-29 12:36:09 +01:00
Laurent Destailleur
52a92924de
Merge pull request #13230 from atm-gauthier/fix_round_accountancy
FIX : round MT in accountancy books
2020-02-29 12:35:33 +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
acb3fb2cd8 Fix extrafields on x-axis 2020-02-29 00:11:19 +01:00
Laurent Destailleur
c6b6b97ac0 FIX Free input for email no more visible 2020-02-28 20:25:17 +01:00
Laurent Destailleur
56704e4029 Add stats of products in MO 2020-02-28 19:26:52 +01:00
Laurent Destailleur
f5a07dfb7e Add status into popup 2020-02-28 18:57:17 +01:00
Laurent Destailleur
6211577db7 Fix list of blog topics 2020-02-28 18:21:26 +01:00
Tobias Sekan
0e7e6f44e2
Update list.php 2020-02-28 16:16:05 +01:00
Tobias Sekan
a8728f9fcf
Update categorie.class.php 2020-02-28 16:14:50 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
stickler-ci
948ac4b99a Fixing style errors. 2020-02-28 15:10:44 +00:00
Tobias Sekan
bc8c709900
Add category filter for stocks 2020-02-28 16:03:35 +01:00
Tobias Sekan
f2fac96a2c
Add helper functions for categories 2020-02-28 16:00:23 +01:00
stickler-ci
89048ca52e Fixing style errors. 2020-02-28 14:49:10 +00:00
BENKE Charlene
50b3c760dd
Update actions_addupdatedelete.inc.php 2020-02-28 15:47:26 +01:00
BENKE Charlene
477cce718b
checkbox not updated when unchecked
GETPOSTISSET return false in this case and the value is not updated
2020-02-28 15:29:12 +01:00
gauthier
284a4189b3 FIX : round MT in accountancy books 2020-02-28 14:32:35 +01:00
Laurent Destailleur
87b3cf9765 FIX Bad link to template invoices 2020-02-28 12:01:43 +01:00
Laurent Destailleur
9f5bde2131 css 2020-02-28 10:51:24 +01:00
Laurent Destailleur
932f91eb61 css 2020-02-27 23:11:39 +01:00
Laurent Destailleur
9c83dc0f1b css 2020-02-27 23:03:39 +01:00
Laurent Destailleur
83957f93e6 Fix edit lang 2020-02-27 22:58:36 +01:00
Laurent Destailleur
e07a29ecd0 Fix class not found 2020-02-27 22:02:45 +01:00
Laurent Destailleur
2205667ca0 Fix multilang 2020-02-27 21:57:36 +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
b326d1fe49 Add link to wiki doc 2020-02-27 18:26:38 +01:00
Laurent Destailleur
1bc18931f8 Fix phpcs 2020-02-27 18:13:26 +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
Marc de Lima Lucio
5d1f91f8ac FIX: muticurrency columns: remove useless column totals that mix currencies together 2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
cdddccde16 NEW: propal list: enable multicurrency columns 2020-02-27 17:34:45 +01:00
Laurent Destailleur
f039008282 Fix reponsive 2020-02-27 16:33:24 +01:00
Laurent Destailleur
eac07aceb0 Responsive 2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
341e4ae856 NEW: order list: enable multicurrency columns 2020-02-27 14:49:34 +01:00
Marc de Lima Lucio
6d728f12ba NEW: invoice list: enable multicurrency columns 2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
98db5232d1 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 14:05:30 +01:00
Alexandre SPANGARO
a85dfaf71e NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 12:09:19 +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
Tobias Sekan
c60e7a4e60
Fix count errror on category view of stocks 2020-02-27 09:02:59 +01:00
Laurent Destailleur
957295ee2d Fix look and feel v11 2020-02-27 01:12:53 +01:00
Laurent Destailleur
df87c77cd8 css 2020-02-27 01:02:55 +01:00
Laurent Destailleur
2cfc62d753
Update invoice.php 2020-02-27 00:11:13 +01:00
javierybar
3fa55a59b7
New TAKEPOS_NUMBERING_PREFIX const 2020-02-26 22:45:32 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
8b1fff202b FIX option MAIN_OPTIMIZEFORTEXTBROWSER 2020-02-26 20:11:42 +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
8f8a733d7b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-26 17:02:32 +01:00
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
Laurent Destailleur
f797f6bbaf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-26 16:59:04 +01:00
Laurent Destailleur
921dacf695 Fix remove $_POST 2020-02-26 16:58:45 +01:00
Laurent Destailleur
85a4c4cf17 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-26 16:54:08 +01:00
Laurent Destailleur
25157649e2 Fix missing column 2020-02-26 16:53:58 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18
Default warehouse to create order
2020-02-26 16:45:25 +01:00
Laurent Destailleur
39d6c31a5d
Merge pull request #13218 from TobiasSekan/FixWarehouseColumnView
FIX column selection on stocklist
2020-02-26 16:33:11 +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
9409a74891
Merge pull request #13209 from oscim/patch-26
Update emailcollector.class.php
2020-02-26 16:22:58 +01:00
Laurent Destailleur
3d436eb645
Merge pull request #13208 from oscim/patch-25
Update emailcollector_card.php
2020-02-26 16:22:28 +01:00
Laurent Destailleur
9c1c0ee08f Fix for nojs interface 2020-02-26 16:17:31 +01:00
Laurent Destailleur
aba29207a3 Fix param lost 2020-02-26 16:10:12 +01:00
Laurent Destailleur
9f097b1a08 FIX #13146 #13198 2020-02-26 15:45:21 +01:00
Laurent Destailleur
b52cfe58d6 FIX Disable js if no javascript 2020-02-26 15:45:12 +01:00
Laurent Destailleur
4370bf8fdc FIX Use GETPOST instead of POST
Conflicts:
	htdocs/admin/ihm.php
2020-02-26 15:44:54 +01:00
Laurent Destailleur
91e7ff3c8e FIX No js if javascript off 2020-02-26 15:43:09 +01:00
Laurent Destailleur
b5aba25b21 css 2020-02-26 15:41:55 +01:00
Laurent Destailleur
1583bed0e4 FIX #13146 #13198 2020-02-26 15:41:46 +01:00
ptibogxiv
b95d74f843
FIX token in barcode tools page 2020-02-26 15:23:59 +01:00
Laurent Destailleur
35e886fb12 FIX Disable js if no javascript 2020-02-26 15:22:23 +01:00
Laurent Destailleur
8ceafa2624 FIX Use GETPOST instead of POST 2020-02-26 15:21:52 +01:00
Laurent Destailleur
315b434a6e FIX No js if javascript off 2020-02-26 15:05:29 +01:00
gauthier
01b9c42670 FIX : timezone must be tzserver and not tzuser as well as on contract card 2020-02-26 15:02:42 +01:00
Tobias Sekan
0622024f61
Fix column selection on stocklist 2020-02-26 14:37:36 +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
stickler-ci
ada99b01f9 Fixing style errors. 2020-02-26 07:20:28 +00:00
stickler-ci
0e91b9e5ec Fixing style errors. 2020-02-26 07:20:08 +00:00
oscim
9011b03528
Update emailcollector.class.php
add hook in loop action
2020-02-26 08:18:01 +01:00
oscim
2522d1e31b
Update emailcollector_card.php
support hook for add action
2020-02-26 08:15:49 +01:00
Laurent Destailleur
114e41108d FIX sort link 2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46 FIX Bad sort link in accounting report 2020-02-26 06:43:52 +01:00
Laurent Destailleur
4831d22354 FIX sort link 2020-02-26 06:43:21 +01:00
Laurent Destailleur
76305d5ac7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-26 06:39:13 +01:00
Laurent Destailleur
6cf6719cfb FIX Bad sort link in accounting report 2020-02-26 06:39:02 +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
8445c1d814
Merge pull request #13199 from dolibit-ut/patch-2
Update HOWTO-Translation.txt
2020-02-26 05:12:44 +01:00