Commit Graph

89109 Commits

Author SHA1 Message Date
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
5e6ee7888c
Merge pull request #13238 from aspangaro/10.0_p37
FIX: typo on ckeck method
2020-03-02 21:49:59 +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
289139e5ab
Merge pull request #11388 from bafbes/abb90064
Can show object photos in modulebuilder lists with a property to format output as user list photos
2020-03-02 21:17:39 +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
Anthony Berton
5520df4e4f
Update list.php 2020-03-02 08:25:18 +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