Commit Graph

84999 Commits

Author SHA1 Message Date
Je2fb
fa32618fe9
Update card.php
If rate change is modify, the currency price is taken in place of the price from the main currency
2020-03-31 18:58:59 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
Laurent Destailleur
766f480741 css 2020-03-31 16:24:33 +02:00
Laurent Destailleur
f09321a497 css 2020-03-31 13:57:19 +02:00
Laurent Destailleur
e75e49426f Look and feel v12 2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b486ea5ad CSS 2020-03-31 13:28:19 +02:00
Laurent Destailleur
e0d713bbef Update demo 2020-03-31 12:56:21 +02:00
Laurent Destailleur
0b1cfcc0cc Fix phpcs 2020-03-31 00:13:27 +02:00
Laurent Destailleur
353d561060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-31 00:11:46 +02:00
Laurent Destailleur
416d1ce3f0 Fix phpcs 2020-03-31 00:11:31 +02:00
Laurent Destailleur
2e1fe7b989
Merge pull request #13451 from andreubisquerra/develop
Log CUPS print error on Receipt Printer module
2020-03-30 20:02:56 +02:00
Laurent Destailleur
5f8d9fc8e8
Merge pull request #13347 from bafbes/abb60311
NEW:Show units of products in stocks and hide total units if content is of diffents units
2020-03-30 20:01:59 +02:00
Laurent Destailleur
774137b937
Update card.php 2020-03-30 20:00:59 +02:00
Laurent Destailleur
401265d09e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
474260e526
Merge pull request #13447 from c3do/patch-1
Fix can set desiredstock to (int) 0 from API Rest
2020-03-30 19:46: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
6ecacb9c29 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:38:07 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
Laurent Destailleur
7466eaade3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Laurent Destailleur
06ad21f2e8
Merge pull request #13442 from fappels/9.0_newToken
Improve modulebuilder compatiblity with maintained versions.
2020-03-30 19:35:45 +02:00
Laurent Destailleur
ff44e2d2ac
Merge pull request #13448 from atm-quentin/FIX_missing_array_option_supplier_proposal_to_supplier_order
FIX missing array option
2020-03-30 19:35:20 +02:00
Laurent Destailleur
02dcb4a79f
Merge pull request #13443 from TobiasSekan/AddPhpMatrix
NEW Documentation about PHP support in Dolibarr
2020-03-30 19:34:49 +02:00
Laurent Destailleur
920eedb542
Delete phpmatrix.md 2020-03-30 19:34:40 +02:00
Laurent Destailleur
2a57b0acc6
Update README.md 2020-03-30 19:34:29 +02:00
andreubisquerra
493e07a14e
Log CUPS print error on Receipt Printer module
Important help to debug errors on CUPS printing
2020-03-30 19:32:23 +02:00
Laurent Destailleur
0e1e825802
Update README.md 2020-03-30 19:32:02 +02:00
Laurent Destailleur
da642823b9
Merge pull request #13445 from cfoellmann/fix-task-creation
Fix function to create a task
2020-03-30 19:31:19 +02:00
Laurent Destailleur
7c9583011a
Merge pull request #13441 from hgy29/patch-1
FIX: extra date field incorrect check
2020-03-30 19:30:25 +02:00
Laurent Destailleur
d2bfc5f6dc
Merge pull request #13437 from pstructures/develop
Add the ability to add tabs from module for company admin setup
2020-03-30 19:25:37 +02:00
Laurent Destailleur
06277ec6e0
Update company.lib.php 2020-03-30 19:24:00 +02:00
Laurent Destailleur
95de8d1992
Update admin.lib.php 2020-03-30 19:23:25 +02:00
Laurent Destailleur
3a33b92151
Merge pull request #13436 from andreubisquerra/develop
TakePOS CSS fix in action buttons
2020-03-30 19:20:57 +02:00
Laurent Destailleur
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
89cbaa3391
Merge pull request #13440 from atm-maxime/new_bom_cost
New bom cost
2020-03-30 19:16:09 +02:00
Laurent Destailleur
0ec35793ee
Merge pull request #13433 from ptibogxiv/patch-315
NEW filter by product on supplier order API
2020-03-30 19:12:29 +02:00
Laurent Destailleur
81b41c932f
Merge pull request #13432 from atm-quentin/FIX_reapro_11
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
Laurent Destailleur
593a78dda7
Merge pull request #13426 from TobiasSekan/FixSupplierProposalMulticurrency
FIX not working add/change supplier proposal line with multi-currency value
2020-03-30 19:00:08 +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
Laurent Destailleur
45a237e31b
Merge pull request #13421 from atm-quentin/NEW_hook_product_load_stats
NEW hook on product load stats
2020-03-30 18:54:31 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
NEW : Project task list, add column selector and extrafields
2020-03-30 18:53:42 +02:00
Laurent Destailleur
04a5929e91
Merge pull request #13431 from aspangaro/12.0_a25
Typo
2020-03-30 18:52:10 +02:00