Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
7297950308 Merge pull request #13759 from OPEN-DSI/stcommcontact
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
a51829d03c CSS 2020-08-02 18:50:08 +02:00
Laurent Destailleur
aca20c89f9 Can use a generic email for recruitment 2020-08-02 18:45:42 +02:00
Laurent Destailleur
a300eae994 Sync transifex 2020-08-02 18:33:15 +02:00
Laurent Destailleur
d054aedc80 Sync language 2020-08-02 18:32:54 +02:00
Laurent Destailleur
04903460b1 Add contact on job page 2020-08-02 18:09:53 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
7239232528 Add total 2020-08-02 16:28:59 +02:00
Laurent Destailleur
d685aec482 css 2020-08-02 16:19:34 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.form.class.php
2020-08-02 16:01:03 +02:00
Laurent Destailleur
b57ec55812 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-02 15:58:13 +02:00
Laurent Destailleur
08ff08fb86 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-02 15:53:48 +02:00
Laurent Destailleur
367914015c NEW Add a counter of number of words of pages in website module 2020-08-02 15:53:34 +02:00
Laurent Destailleur
ac75d5415b Merge pull request #14343 from andreubisquerra/master
NEW: TakePOS Gift Receipt
2020-08-02 15:07:29 +02:00
jove@bisquerra.com
593c7242c4 NEW: TakePOS Gift Receipt 2020-08-02 11:13:41 +02:00
Laurent Destailleur
608656ae89 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-02 01:35:15 +02:00
Laurent Destailleur
9aa9852e85 Fix perms 2020-08-02 01:35:03 +02:00
Laurent Destailleur
ebe2e8ea04 Merge pull request #14319 from aspangaro/13a3
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
2020-08-02 01:33:39 +02:00
Laurent Destailleur
8c4b4e233d Merge pull request #14317 from fappels/12_show_virtual_stock
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2020-08-02 01:32:18 +02:00
Laurent Destailleur
32d2dd71e2 Merge pull request #14324 from FHenry/dev_add_ProductHook
NEW add formConfirm hook on product page
2020-08-02 01:29:33 +02:00
Laurent Destailleur
91db3b9344 Merge pull request #14323 from altatof/fixsizewithff
FIX : duration fields size with firefox
2020-08-02 01:25:11 +02:00
Laurent Destailleur
d44a16bdfa Merge pull request #14327 from FHenry/dev_refac_classproduct
->error rather than dol_print_error into product class
2020-08-02 01:21:19 +02:00
Laurent Destailleur
75d8455789 Merge pull request #14328 from marc-dll/NEW_api_thirdparty_price_level
NEW: thirdparty REST API: endpoint to set price level
2020-08-02 01:20:05 +02:00
Laurent Destailleur
4886dd2854 Merge pull request #14333 from bafbes/abb110227
fix:erroneous input id name
2020-08-02 01:19:03 +02:00
Laurent Destailleur
817912ea40 FIX #14291 2020-08-02 01:11:23 +02:00
Laurent Destailleur
728460fa1b Look and feel v13 2020-08-02 01:01:40 +02:00
Laurent Destailleur
328a25abea FIX Bad back to link 2020-08-02 00:59:53 +02:00
Laurent Destailleur
34cbdaf2ff Look and feel v13 2020-08-02 00:52:01 +02:00
Laurent Destailleur
8aa968a27c NEW Can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode 2020-08-02 00:41:26 +02:00
Laurent Destailleur
d08c42a205 CSS Better visibility for buttons and status 2020-08-02 00:15:21 +02:00
Laurent Destailleur
3bfd7644a4 Fix return link 2020-08-01 20:17:49 +02:00
bahfir abbes
6d3cebfa3c fix:erroneous input id name 2020-08-01 12:54:42 +01:00
Marc DLL
5087d35f86 NEW: thirdparty REST API: endpoint to set price level 2020-07-31 17:48:44 +02:00
kkhelifa-opendsi
fe0f77b967 Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
florian HENRY
e44a1fd33f ->error rather than dol_print_error into product 2020-07-31 16:09:38 +02:00
florian HENRY
164e3bff2c add formConfirm hook 2020-07-31 15:23:26 +02:00
Laurent Destailleur
0b46fcb4f8 Debug 2020-07-31 14:02:08 +02:00
Laurent Destailleur
0d71cd4279 Fix td not closed 2020-07-31 13:51:49 +02:00
Laurent Destailleur
f80b54e573 Debug setup of receipt printer module 2020-07-31 13:44:55 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
Laurent Destailleur
255dc71823 Missing translation 2020-07-31 13:20:05 +02:00
altairis
448cd1cd36 Merge branch '10.0' into fixsizewithff 2020-07-31 12:23:57 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Alexandre SPANGARO
d1560c3e75 NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM 2020-07-30 21:10:06 +02:00
Laurent Destailleur
f5d7e94d7e NEW Add a stat page to list popularity of products on invoices
Merge duplicate pages into 1.
2020-07-30 19:32:06 +02:00
Laurent Destailleur
e7fedd5c2d FIX Sql error on stat by referring entries of a product 2020-07-30 19:14:40 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00