Laurent Destailleur
fa96fd8a8b
Update actions_addupdatedelete.inc.php
2020-08-04 12:19:44 +02:00
Laurent Destailleur
cc88fe9b68
Merge pull request #14365 from bafbes/abb120131
...
NEW Add link to reset qty on supplier dispatch page
2020-08-04 12:00:47 +02:00
Laurent Destailleur
4bacb7d48e
Update dispatch.php
2020-08-04 12:00:24 +02:00
Laurent Destailleur
fd551261bb
Update dispatch.php
2020-08-04 11:58:29 +02:00
Laurent Destailleur
dbb2e8b1ba
Update dispatch.php
2020-08-04 11:56:01 +02:00
Laurent Destailleur
615995476b
Merge pull request #14367 from andreubisquerra/master
...
Improve TakePOS search on click ENTER
2020-08-04 11:52:36 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Laurent Destailleur
96581ef1f4
Merge pull request #14370 from fappels/12_fix_search_stock_list
...
FIX search warehouse list
2020-08-04 11:49:20 +02:00
Francis Appels
81467e1d09
FIX search warehouse list
2020-08-04 11:05:12 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
andreubisquerra
0347f2a46b
More elegant
2020-08-04 08:19:27 +02:00
jove@bisquerra.com
6d957c276c
Improving TakePOS search informing the user if there is no record or clearing the box if it exists avoiding manually clear every scan
2020-08-04 08:11:44 +02:00
Laurent Destailleur
bf1f295602
NEW Can disable, from edit page, the whole web site
...
FIX position of a cloned website
2020-08-04 02:50:56 +02:00
Laurent Destailleur
063b63d348
Fix phpcs
2020-08-04 00:36:45 +02:00
Bahfir Abbes
8dd54e24e7
empty is more useful than 0
2020-08-03 20:42:25 +01:00
bahfir abbes
4900e85fa8
fix: reset link on supplier dispatch
2020-08-03 20:31:55 +01:00
Laurent Destailleur
da76775fbd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/factures.php
htdocs/compta/prelevement/fiche-rejet.php
2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a
FIX Debug module direct debit order. Solve conflict with credit transfer
2020-08-03 20:16:33 +02:00
bahfir abbes
e24027fb1e
fix: restore autofill lost functionality
2020-08-03 18:44:36 +01:00
Laurent Destailleur
22f69f0da9
CSS
2020-08-03 17:39:18 +02:00
Laurent Destailleur
c78b19b3b8
Move module as experimental (it is working enough).
2020-08-03 16:39:52 +02:00
Laurent Destailleur
d5237e6fda
css
2020-08-03 16:36:31 +02:00
Laurent Destailleur
fa26d2acdf
css
2020-08-03 16:31:52 +02:00
bahfir abbes
15a634959f
fix:value of checked option must be the same as in showInputfield function
2020-08-03 14:32:57 +01:00
Laurent Destailleur
aa696d8343
Show warning in kanban view
2020-08-03 15:17:37 +02:00
VERDOL Gauthier
2d192431bc
FIX : wrong element var for fetch_name_optionals_label function with expeditions
2020-08-03 14:59:51 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
b6a3938921
FIX Size of image on the help popup of modules
2020-08-03 14:32:42 +02:00
Laurent Destailleur
d1f92fb66b
NEW: Add module Credit transfer SEPA to manage payment of supplier using
...
bank credit transfer SEPA files
2020-08-03 14:15:14 +02:00
Laurent Destailleur
8c34acbf55
FIX Warning if no bank account defined
2020-08-03 14:11:15 +02:00
Laurent Destailleur
defbd26f95
Help to fight errors ErrorBadValueForParamNotAString
2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0
FIX input field of extrafields must keep data if form submit fails.
2020-08-03 12:31:30 +02:00
Florian Mortgat
ce18a4f029
FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default
2020-08-03 12:28:12 +02:00
Laurent Destailleur
576363f353
Fix error message
2020-08-03 12:26:26 +02:00
Laurent Destailleur
d59bcd3f5b
FFIX error creating record when extrafields price exists in other entity
2020-08-03 12:08:33 +02:00
quentin
bbfca90260
FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order
2020-08-03 11:54:26 +02:00
Laurent Destailleur
55f3a8b4f8
Fix col size too large by migrating to dynamic format on tables
2020-08-03 11:37:55 +02:00
stickler-ci
9926eac192
Fixing style errors.
2020-08-03 09:26:36 +00:00
Laurent Destailleur
e64b8eaf40
Fix debug credit transfer module
2020-08-03 11:21:13 +02:00
quentin
72b2fb442b
fix test libelle
2020-08-03 11:17:39 +02:00
Ferran Marcet
63b15dd1b6
Fix: User can see events that are not assigned to it
2020-08-03 11:17:30 +02:00
quentin
b026896a98
FIX product label and desc were never updated when modifying trans
2020-08-03 10:33:48 +02:00
Philippe GRAND
42fcb64700
Change comment to fixe a lot of undefined method
2020-08-03 10:26:01 +02:00
Philippe GRAND
85b2adaaec
Change comment to fixe a lot of undefined method
2020-08-03 10:13:18 +02:00
Philippe GRAND
0d6274c8fe
Change comment to fixe a lot of undefined method
2020-08-03 10:04:54 +02:00
Philippe GRAND
d6c84ef5ce
Change comment to fixe a lot of undefined method
2020-08-03 10:02:25 +02:00
Philippe GRAND
6fa3e8df4e
Change comment to fixe a lot of undefined method
2020-08-03 10:00:20 +02:00
Philippe GRAND
3a2e527454
Change comment to fixe a lot of undefined method
2020-08-03 09:58:47 +02:00
Philippe GRAND
1ea21ee1b8
Change comment to fixe a lot of undefined method
2020-08-03 09:56:48 +02:00
Philippe GRAND
d446a38b34
Change comment to fixe a lot of undefined method
2020-08-03 09:54:19 +02:00
Philippe GRAND
9fd520b5d4
Change comment to fixe a lot of undefined method
2020-08-03 09:52:11 +02:00
Laurent Destailleur
679625daee
Trans
2020-08-03 09:51:15 +02:00
Philippe GRAND
3b80e9a08e
Change comment to fixe a lot of undefined method
2020-08-03 09:50:30 +02:00
Philippe GRAND
8ff27f89e5
Change comment to fixe a lot of undefined method
2020-08-03 09:48:25 +02:00
Philippe GRAND
703de5286f
Change comment to fixe a lot of undefined method
2020-08-03 09:46:07 +02:00
Philippe GRAND
ed6d83687c
Change comment to fixe a lot of undefined method
2020-08-03 09:44:44 +02:00
Philippe GRAND
2c4d8bceb6
Change comment to fixe a lot of undefined method
2020-08-03 09:39:54 +02:00
Philippe GRAND
c7bf47a00b
Change comment to fixe a lot of undefined method
2020-08-03 09:38:05 +02:00
Philippe GRAND
857505a887
Change comment to fixe a lot of undefined method
2020-08-03 09:36:23 +02:00
Philippe GRAND
0e0adcbe43
Change comment to fixe a lot of undefined method
2020-08-03 09:33:19 +02:00
Philippe GRAND
38f4e0392d
Change comment to fixe a lot of undefined method
2020-08-03 09:30:31 +02:00
Philippe GRAND
8bdf15a6a6
Change comment to fixe a lot of undefined method
2020-08-03 09:28:25 +02:00
Philippe GRAND
83d1ff2a6c
Change comment to fixe a lot of undefined method
2020-08-03 09:25:17 +02:00
Philippe GRAND
0b75280104
Change comment to fixe a lot of undefined method
2020-08-03 09:19:55 +02:00
Philippe GRAND
ccb9d62a14
Change comment to fixe a lot of undefined method
2020-08-03 09:13:46 +02:00
Laurent Destailleur
805ad6f5fe
Several fixes
2020-08-02 22:44:37 +02:00
Laurent Destailleur
4afdfdda53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
2020-08-02 22:42:17 +02:00
Laurent Destailleur
c35a103694
Fix phpcs
2020-08-02 22:40:17 +02:00
Laurent Destailleur
66d4b7372e
FIX Look and feel v12
...
Conflicts:
htdocs/comm/card.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2020-08-02 22:38:20 +02:00
Laurent Destailleur
87f71e7681
FIX Look and feel v12
2020-08-02 22:36:14 +02:00
Laurent Destailleur
d9818405c6
Fix regression for v13
2020-08-02 22:30:23 +02:00
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
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
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
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
Laurent Destailleur
618c85ceb1
FIX Filter too large for extrafields with type text or html
2020-07-30 14:49:31 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Laurent Destailleur
05531f95d6
Fix phpcs
2020-07-30 14:03:01 +02:00
Laurent Destailleur
2ff6791e53
css
2020-07-30 04:23:23 +02:00
Laurent Destailleur
4ed1da1632
Work on recruitment module
2020-07-30 04:17:05 +02:00
Laurent Destailleur
f937f5beea
Work on recruitment module
2020-07-30 04:06:27 +02:00
Laurent Destailleur
c79d617a50
Add public page of job position offers
2020-07-30 03:50:27 +02:00
Francis Appels
54410189bc
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
...
When product ajax search used a dash is show, so virtual stock looks like being negative value.
2020-07-29 17:00:39 +02:00
Laurent Destailleur
d08b3513dc
Merge pull request #14247 from FHenry/11.0_fix_commerce_MenuSupplierORderOnly
...
fix display Commerce top menu user only supplier order rights and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-29 14:27:14 +02:00
Laurent Destailleur
6a5427ee4f
Merge pull request #14274 from atm-quentin/FIX_null_required
...
FIX null required
2020-07-29 14:13:53 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php
2020-07-29 14:13:29 +02:00
Laurent Destailleur
3e586d3b26
Merge pull request #14285 from RomainDeschamps/patch-7
...
NEW add costprice in fields of products list
2020-07-29 13:57:17 +02:00
Laurent Destailleur
2c12a761ee
Merge pull request #14283 from atm-john/11.0_fix_mysql_update
...
Fix MySQL rank usage for column
2020-07-29 13:56:20 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
2020-07-29 13:50:31 +02:00
Laurent Destailleur
ab4b1b1f29
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:48:18 +02:00
Laurent Destailleur
4a291f181f
Fix regression
2020-07-29 13:47:04 +02:00
Laurent Destailleur
c93a4c7fc0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:40:27 +02:00
Laurent Destailleur
566f683c54
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:40:19 +02:00
Romain DESCHAMPS
eaef99b7af
second approval back in stable feature as is the setting for minimum amount
2020-07-29 13:39:38 +02:00
Laurent Destailleur
9e85abc8c1
Merge pull request #14286 from RomainDeschamps/patch-1
...
second approval back in stable feature as is the setting for minimum …
2020-07-29 13:38:58 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags
...
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
2020-07-29 13:34:45 +02:00
Laurent Destailleur
9bef1ef6dd
Merge pull request #14298 from bafbes/abb110230
...
fetch product model_pdf field
2020-07-29 13:19:09 +02:00
Laurent Destailleur
1d686a0d4c
Update product.class.php
2020-07-29 13:18:49 +02:00
Laurent Destailleur
0928a5843b
Merge pull request #14300 from bafbes/abb110232
...
fix:fetch and update model_pdf attribute for societe
2020-07-29 13:11:51 +02:00
Laurent Destailleur
377e331e6a
Merge pull request #14288 from atm-florianm/FIX_11.0_debugbar_body_bottom_margin_offset
...
FIX 11.0: DebugBar hides content at page bottom
2020-07-29 13:10:56 +02:00
Laurent Destailleur
af177f2833
Update reassort.php
2020-07-29 13:07:02 +02:00
Laurent Destailleur
d1cb7d447f
Merge branch 'develop' into FIX_10.0_reassort_hooks
2020-07-29 13:05:12 +02:00
AXeL
3c6eb5e0e2
Add missing "Default values" menu entry to auguria menu
2020-07-29 13:02:11 +02:00
Laurent Destailleur
a0d3fd5756
Merge pull request #14289 from AXeL-dev/patch-12
...
Add missing "Default values" menu entry to auguria menu
2020-07-29 13:01:43 +02:00
Laurent Destailleur
d9191c74d8
Update fournisseur.commande.class.php
2020-07-29 12:59:59 +02:00
Laurent Destailleur
cb8c8a1d50
Merge pull request #14305 from marc-dll/FIX_10.0_expedition_create
...
FIX: shipping creation: checks not done on weight and sizes
2020-07-29 12:59:23 +02:00
Laurent Destailleur
d2e730f8e5
Merge pull request #14310 from atm-gauthier/10.0_fix_wrong_column_order_by
...
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
2020-07-29 12:58:28 +02:00
Tim Otte
85c5f423b1
Added fetch_thirdparty (without the site crashes)
2020-07-29 12:55:58 +02:00
Laurent Destailleur
391fcc799b
FIX #14279
2020-07-29 12:51:18 +02:00
Laurent Destailleur
44cfb77622
FIX #14292
2020-07-29 12:43:53 +02:00
Laurent Destailleur
41483df689
FIX #14076
2020-07-29 12:31:03 +02:00
lvessiller
8ee5b16e89
FIX redirect on contact card from main search
2020-07-29 12:00:22 +02:00
VERDOL Gauthier
d214dbb5fd
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
2020-07-28 15:42:54 +02:00
atm-lena
b480fb2dfc
Delete double line
2020-07-28 15:32:58 +02:00
atm-lena
9f0c3b0db1
fetch() command fourn : Same management as commande.class.php of entity
2020-07-28 15:13:56 +02:00
Tim Otte
c5816478d9
Added fetch_thirdparty (without the site crashes)
2020-07-28 11:14:55 +02:00
Laurent Destailleur
81cb5501bc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e
FIX Checkbox "drop table" was not checked when using php method for dump
2020-07-28 10:23:09 +02:00
Laurent Destailleur
364fb05ed3
Fix phpcs
2020-07-28 09:46:31 +02:00
Laurent Destailleur
4e4f0a4575
Use same case for all sql files
2020-07-28 09:44:48 +02:00
Laurent Destailleur
98064f7329
FIX Bad param
2020-07-28 03:02:38 +02:00
Laurent Destailleur
fef180cf86
Fix scrutinizer errors
2020-07-28 02:54:37 +02:00
Laurent Destailleur
8c425ae796
FIX Bad param
2020-07-28 02:47:46 +02:00
Marc DLL
a4427bd2d2
FIX: product stock/reassort list: add hooks
2020-07-27 23:58:06 +02:00
Marc DLL
ee55b82a8d
FIX: shipping creation: checks not done on weight and sizes
2020-07-27 23:27:44 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d
Fix several trouble with diret debit module and credit transfer module
2020-07-27 19:33:24 +02:00
abb
5aa4e2353a
fix:fetch and update model_pdf attribute for societe
2020-07-27 15:40:25 +01:00
VERDOL Gauthier
25994e61bc
FIX : We need to see unit line on PDF even though it's an option
2020-07-27 16:04:21 +02:00
abb
ad85671265
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-07-27 13:48:12 +01:00
Laurent Destailleur
6d8060bc50
FIX DO not erase variable $key and $label during output of extrafields
...
Conflicts:
htdocs/core/tpl/extrafields_view.tpl.php
2020-07-27 14:22:55 +02:00
Laurent Destailleur
b93f60c446
Look and feel v13
2020-07-27 14:19:50 +02:00
Laurent Destailleur
10484ba06e
FIX DO not erase variable $key and $label during output of extrafields
2020-07-27 14:04:41 +02:00
Laurent Destailleur
988e9e5817
Update to jquery 3.5.1
2020-07-27 13:52:19 +02:00
abb
fd6477c054
fetch product model_pdf field
2020-07-27 10:57:39 +01:00
Laurent Destailleur
19b550009b
Trans
2020-07-27 02:38:31 +02:00
Laurent Destailleur
9798bb1b30
Fix responsive
2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248
FIX Setup of clicktodial hang on smartphone
2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7
Fix responsive
2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a
FIX Setup of clicktodial hang on smartphone
2020-07-27 02:25:09 +02:00
Laurent Destailleur
26c253113b
Removed not used files
2020-07-26 22:04:19 +02:00
Laurent Destailleur
cef996926e
WIP Add publilc interface for recruitment
2020-07-26 22:03:40 +02:00
Laurent Destailleur
01adf73e53
WIP Add publilc interface for recruitment
2020-07-26 22:02:49 +02:00
Laurent Destailleur
714481f7e5
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:07:39 +02:00
Laurent Destailleur
d945ef67e1
FIX Picto of HRM module
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4
FIX Picto of HRM module
2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
Laurent Destailleur
f847cad197
Fix perm
2020-07-26 20:02:29 +02:00
Laurent Destailleur
12bb44ed03
Fix recruitment
2020-07-26 19:57:42 +02:00
Laurent Destailleur
4fadd747ae
Trans
2020-07-26 19:53:51 +02:00
Laurent Destailleur
353e99c26a
Fix look and feel
2020-07-26 19:43:55 +02:00
Laurent Destailleur
cdf7261c7e
Fix look and feel
2020-07-26 19:27:29 +02:00
Laurent Destailleur
378c45fe5c
Fix look and feel
2020-07-26 19:21:47 +02:00
Laurent Destailleur
f17942675d
Look and feel
2020-07-26 18:34:50 +02:00
Laurent Destailleur
b93cab2e77
css
2020-07-26 00:04:10 +02:00
Laurent Destailleur
e33722750c
Fix option THEME_SHOW_BORDER_ON_INPUT
2020-07-25 19:05:52 +02:00
AXeL
28fb57d8d6
Add missing "Default values" menu entry to auguria menu
2020-07-25 14:07:44 +01:00
Laurent Destailleur
52f238a351
Fix label
2020-07-25 14:50:09 +02:00
Laurent Destailleur
2d45fd04fe
Doc
2020-07-25 14:47:43 +02:00
FlorianMortgat
93348630bf
FIX 11.0: computation of the bottom margin of <body> returns NaN because body is not loaded yet
2020-07-25 11:05:05 +02:00
Laurent Destailleur
dd86c21382
FIX dolGetElementUrl and agenda page for external modules
2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b
FIX: allow more harmless html tags
2020-07-25 00:57:40 +02:00
Laurent Destailleur
e3126ec999
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
Laurent Destailleur
3ed4773d7f
Fix tab popup when there is 2 head tabs in same page
2020-07-24 18:31:14 +02:00
Laurent Destailleur
b82b6736d1
Look and feel
2020-07-24 18:13:01 +02:00
Laurent Destailleur
6d4b113c72
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 14:25:59 +02:00
Romain DESCHAMPS
09bf8bea85
second approval back in stable feature as is the setting for minimum amount
2020-07-24 14:11:42 +02:00
Laurent Destailleur
d6f1a897f6
Fix size of module box
2020-07-24 13:44:32 +02:00
stickler-ci
fd34908c17
Fixing style errors.
2020-07-24 11:42:18 +00:00
Romain DESCHAMPS
c370241afd
add costprice in fields of the list
2020-07-24 13:40:06 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve
...
Improve printStdColumnContent by passing the $pdf object
2020-07-24 13:20:03 +02:00
Laurent Destailleur
a6e728a4d8
Merge pull request #14246 from fappels/11_fix_date_fourn_price_log
...
FIX: date in supplier price log tooltip.
2020-07-24 13:18:36 +02:00
Laurent Destailleur
4e4e737ff2
Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link
...
FIX : wrong link to third invoice templates
2020-07-24 13:13:15 +02:00
Laurent Destailleur
fb1c226e56
Init var
2020-07-24 13:05:19 +02:00
Laurent Destailleur
ff4ec934e9
Merge pull request #14277 from atm-quentin/fix_warning_total
...
FIX warning
2020-07-24 12:55:24 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php
2020-07-24 12:55:12 +02:00
Laurent Destailleur
c699d71abc
Merge pull request #14281 from ATM-Consulting/11.0_fix_multicurency_option_not_applied
...
Fix multicurecy option not applied
2020-07-24 12:54:27 +02:00
Laurent Destailleur
93fea8591c
Fix phpcs
2020-07-24 12:17:02 +02:00
Laurent Destailleur
68c23fdadf
Fix phpcs
2020-07-24 12:15:25 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1
FIX dolGetElementUrl and agenda page for external modules
2020-07-24 11:53:44 +02:00
stickler-ci
8273dbcd49
Fixing style errors.
2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php
2020-07-24 10:37:19 +02:00
Laurent Destailleur
195ad9e5fb
Fix exclude .back files
2020-07-24 10:21:20 +02:00
Laurent Destailleur
f50fc751ab
Trans
2020-07-24 10:02:24 +02:00
Laurent Destailleur
ce3248ab57
Trans
2020-07-24 10:01:05 +02:00
Laurent Destailleur
3109d9c16a
Look and feel v13
2020-07-24 09:58:39 +02:00
Laurent Destailleur
afbeb026ab
Trans
2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3
NEW Can change size of logo on PDF documents
2020-07-24 03:36:44 +02:00
Laurent Destailleur
cf89e159bd
Typo
2020-07-24 03:19:37 +02:00
Laurent Destailleur
fa29549976
Fix trans
2020-07-24 03:09:31 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
e0d22b739d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/stock/class/entrepot.class.php
2020-07-24 01:53:24 +02:00
Laurent Destailleur
db9fc264d9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-24 01:51:20 +02:00
Laurent Destailleur
34a9eee7a6
Minor fix in translation
2020-07-24 01:50:57 +02:00
Laurent Destailleur
0f4e00a2a3
Fix language
2020-07-24 01:43:03 +02:00
Laurent Destailleur
99935ce11f
FIX Should not be able to edit qty on shipment when no stock available
2020-07-24 01:31:07 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
Laurent Destailleur
a46f4df147
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/clicktodial.php
2020-07-24 00:15:56 +02:00
Laurent Destailleur
0890b15077
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70
FIX ClickToDial tab of users has disappeared
2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d
FIX Can go on page even when module disabled
2020-07-23 23:57:12 +02:00
ATM john
921e904acc
Fix MySQL rank usage for column
2020-07-23 20:34:11 +02:00
John Botella
55e65bbabf
Fix variable init
2020-07-23 11:12:04 +02:00
John Botella
fc1de5b4f3
Fix multicurecy option not applied
2020-07-23 11:10:18 +02:00
quentin
7bc683b234
FIX warning
2020-07-22 15:13:50 +02:00
quentin
255bd6b26c
FIX null required
2020-07-22 11:54:52 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php
...
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
2020-07-22 11:44:26 +02:00
VERDOL Gauthier
55298317e3
FIX : wrong link to third invoice templates
2020-07-20 16:22:48 +02:00
florian HENRY
734a6de996
Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_fix_commerce_MenuSupplierORderOnly
2020-07-20 09:01:30 +02:00
florian HENRY
2c5e96bb28
better fix
2020-07-20 09:01:21 +02:00
Laurent Destailleur
9a506ff9b3
css
2020-07-20 03:29:22 +02:00
Laurent Destailleur
d823bb73c0
Change order of fields for mass stock movement
2020-07-20 01:01:40 +02:00
Laurent Destailleur
9d9f865f37
fetch_optionals must be included into a fetch
2020-07-20 00:24:14 +02:00
Laurent Dinclaux
3cdabbaaff
Explicitly pass the pdf object by reference in the printStdColumnContent hook call.
2020-07-19 21:53:06 +11:00
Francis Appels
c2030a7db5
jdate already in function listProductFournisseurPriceLog
...
So no conversion needed.
2020-07-19 09:43:15 +02:00
Laurent Destailleur
e5688e2641
Fix phpcs
2020-07-19 02:54:25 +02:00
Laurent Destailleur
87cd4b11bd
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
Laurent Destailleur
acdb61b640
Merge pull request #14227 from defrance/patch-154
...
NEW : add class for ticket edition (pdf or odt)
2020-07-19 02:11:13 +02:00
Laurent Destailleur
e17fbf9dcd
Merge pull request #14206 from atm-josselin/NEW_show_label_on_batch_card
...
NEW Show label on batch card
2020-07-19 02:03:46 +02:00
Laurent Destailleur
3c3be1b04f
Merge pull request #14188 from aspangaro/13a1
...
NEW: Add column quantity in product margin page
2020-07-19 02:02:30 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0
...
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
521c4679d9
FIX #14241 Mysql 8 compatibility
2020-07-19 01:52:30 +02:00
Laurent Destailleur
f26a64fb88
FIX If using a rounding step, localtax1+2 not included in total
2020-07-19 01:47:17 +02:00
Laurent Destailleur
48adeb9dd7
FIX #14256
2020-07-19 01:38:38 +02:00
Laurent Destailleur
6fdd5ea73a
Not required
2020-07-19 01:31:51 +02:00
Laurent Destailleur
ee74740384
FIX #14259
2020-07-19 01:29:42 +02:00
Laurent Destailleur
16d486e211
FIX Setup of currency limit and accuracy
2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4
Code comment
2020-07-19 00:02:02 +02:00
Laurent Destailleur
3069eaa5c0
Merge pull request #14191 from Gecka-Apps/12.0-fix-14181
...
[REGRESSION] Fix #14181 . Limits and accuracy form not saving modified values.
2020-07-18 23:59:29 +02:00
Laurent Destailleur
1f52d99726
Merge pull request #14211 from bb2a/add_zip_town_on_SEARCH_THIRDPARTY
...
Add zip town on search thirdparty
2020-07-18 23:58:36 +02:00
Laurent Destailleur
31cb57afc9
Fix regression with ecoterm
2020-07-18 23:27:43 +02:00
Laurent Destailleur
c30491284f
Fix phpcs
2020-07-18 23:16:05 +02:00
Laurent Destailleur
52fd424812
Merge pull request #14226 from cfoellmann/thirdparty-leftmenu
...
Thirdparty leftmenu
2020-07-18 23:13:40 +02:00
Abdessalam@MEGALOGI
1e6273b92d
Update card.php
...
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-18 23:11:17 +02:00
Laurent Destailleur
090d913017
Merge pull request #14248 from megalogi/patch-1
...
FIX Lose HTML tags when adding a new product/service into a document
2020-07-18 23:10:33 +02:00
Laurent Destailleur
3bfa86c52d
Merge pull request #14251 from fmarcet/develop
...
New: ##12972 Update supplier price also when product has batch
2020-07-18 23:08:20 +02:00
Oarces DEV
f3e3c47af3
Add the possibility for the prospect to order
...
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 23:04:22 +02:00
Laurent Destailleur
0179800236
Merge pull request #14257 from cmfpmatik/cmfpmatik-order_prospect-1
...
Add the possibility for the prospect to order
2020-07-18 23:03:34 +02:00
Laurent Destailleur
15cdb3ed79
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0
2020-07-18 23:00:09 +02:00
Laurent Destailleur
ac92a9fa40
Doc more complete
2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82
Fix comment
2020-07-18 19:41:11 +02:00
Laurent Destailleur
384cb22d3a
Merge pull request #14220 from FHenry/11.0
...
fix missing entity into fetch wharehouse
2020-07-18 19:32:24 +02:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
...
Fix extrafields ordering on PDFs
2020-07-18 19:30:34 +02:00
Laurent Destailleur
eef66ae6ed
Fix var not defined
2020-07-18 19:22:03 +02:00
Laurent Destailleur
bb4543167f
FIX #14222
2020-07-18 19:19:12 +02:00
Laurent Destailleur
ab32e3e1a9
Merge pull request #14222 from pstructures/PSdevelop
...
Error Caused by $taskid Variable not existing
2020-07-18 19:15:28 +02:00
Laurent Destailleur
ecfcbeef26
Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject
...
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-18 19:13:52 +02:00
Laurent Destailleur
a8fbec8491
Merge pull request #14216 from grandoc/new_branch_11_07_2020
...
Minimum version of PHP required by module
2020-07-18 19:12:50 +02:00
Laurent Destailleur
cd997d216e
Merge pull request #14230 from cfoellmann/fix-default-search
...
fix the global `DEFAULT_SEARCH_INTO_MODULE`
2020-07-18 19:11:23 +02:00
Laurent Destailleur
179f3d44c6
Merge pull request #14238 from dolibit-ut/patch-32
...
Update llx_c_incoterms.sql
2020-07-18 19:09:26 +02:00
Laurent Destailleur
f07a1a6d1e
FIX for #14253
2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645
FIX for #14253
2020-07-18 18:52:33 +02:00
Oarces DEV
97826f140f
Add the possibility for the prospect to order
...
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 11:55:42 +02:00
stickler-ci
28bc001ba9
Fixing style errors.
2020-07-17 08:52:52 +00:00
Ferran Marcet
125be4271e
New: ##12972 Update supplier price also when product has batch
2020-07-17 10:50:24 +02:00
Abdessalam@MEGALOGI
9d481cf15e
Update card.php
...
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-15 20:21:27 +01:00
florian HENRY
d2e528d8c1
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-15 17:45:34 +02:00
Alexandre SPANGARO
8d9f0dc4b2
Merge remote-tracking branch 'upstream/develop' into 13a1
2020-07-15 13:53:55 +02:00
Francis Appels
1bc1fd4cb4
Fix date in supplier price log tooltip.
2020-07-15 11:24:11 +02:00
UT from dolibit
60f904bbd3
Update llx_c_incoterms.sql
...
add column label for short standard term in english
(libelle to use for long description (in user language))
2020-07-14 14:15:44 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql
...
add column 'label' for short term description in english
add new Incoterm DPU (DAT is obsolete , but let it stay for older documents)
2020-07-14 13:59:16 +02:00
florian HENRY
f4074428f8
fix filter wharehouse list on ref
2020-07-14 09:38:52 +02:00
Christian Foellmann
a4e9c478e7
fix the global DEFAULT_SEARCH_INTO_MODULE - current value will not push anything above the core modules
2020-07-13 18:14:57 +02:00
florian HENRY
72e0250117
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:53:00 +02:00
florian HENRY
1173059e7b
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:52:41 +02:00
florian HENRY
96d26be1d4
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:51:58 +02:00
florian HENRY
045fbad616
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:48:21 +02:00
BENKE Charlene
a2cf473891
add class for ticket edition (pdf or odt)
2020-07-13 14:24:07 +02:00
Christian Foellmann
4674367099
remove old commented out code lines
2020-07-13 14:18:16 +02:00
Christian Foellmann
d43c30defd
change level of left menu for thirdparty types
2020-07-13 14:17:12 +02:00
Matt Sidnell
50e3822465
Merge branch 'PSdevelop' of https://github.com/pstructures/dolibarr-core into PSdevelop
2020-07-12 21:22:06 +01:00
Matt Sidnell
2797c5e65f
Updated Issue with declared progress
2020-07-12 21:21:34 +01:00
mattsidnell
ac945b5d96
Merge pull request #14 from Dolibarr/develop
2020-07-12 20:35:42 +01:00
florian HENRY
32e4635e84
fix missing entity into fetch wharehouse
2020-07-12 21:34:13 +02:00
Matt Sidnell
378c8c4691
Error on time pent page where progress was getting unset
2020-07-12 20:34:04 +01:00
florian HENRY
7b5072a21b
fix missing entity
2020-07-12 10:10:46 +02:00
florian HENRY
2f8968478d
fix missing entity into fetch wahrehouse
2020-07-12 10:06:04 +02:00
Alfredo Altamirano
6aae68bb07
Change Mexico City name
...
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Philippe GRAND
ffae6b02c1
Minimum version of PHP required by module
2020-07-11 15:11:39 +02:00
Philippe GRAND
448f031948
Minimum version of PHP required by module
2020-07-11 15:11:15 +02:00
Philippe GRAND
5902dd6df3
Minimum version of PHP required by module
2020-07-11 15:10:53 +02:00
Philippe GRAND
2906e9b848
Minimum version of PHP required by module
2020-07-11 15:10:26 +02:00
Philippe GRAND
fc778e433f
Minimum version of PHP required by module
2020-07-11 15:10:02 +02:00
Philippe GRAND
8c5bdb8fb6
Minimum version of PHP required by module
2020-07-11 15:09:36 +02:00
Philippe GRAND
3ee18e5852
Minimum version of PHP required by module
2020-07-11 15:09:15 +02:00
Philippe GRAND
1d5a1beb79
Minimum version of PHP required by module
2020-07-11 15:08:52 +02:00
Philippe GRAND
1bb60ca7cc
Minimum version of PHP required by module
2020-07-11 15:08:28 +02:00
Philippe GRAND
1358801316
Minimum version of PHP required by module
2020-07-11 15:08:00 +02:00
Philippe GRAND
b4252b899c
Minimum version of PHP required by module
2020-07-11 15:07:33 +02:00
Philippe GRAND
9451148928
Minimum version of PHP required by module
2020-07-11 15:07:09 +02:00
Philippe GRAND
bbde5a3c95
Minimum version of PHP required by module
2020-07-11 15:06:44 +02:00
Philippe GRAND
05b97dc134
Minimum version of PHP required by module
2020-07-11 15:06:17 +02:00
Philippe GRAND
eb602d8bae
Minimum version of PHP required by module
2020-07-11 15:05:49 +02:00
Philippe GRAND
2e6addae11
Minimum version of PHP required by module
2020-07-11 15:05:20 +02:00
Philippe GRAND
f453c2272a
Minimum version of PHP required by module
2020-07-11 15:04:54 +02:00
Philippe GRAND
3a4f526ccd
Minimum version of PHP required by module
2020-07-11 15:04:31 +02:00
Philippe GRAND
8f37bb5a69
Minimum version of PHP required by module
2020-07-11 15:04:06 +02:00
Philippe GRAND
d4562a91ff
Minimum version of PHP required by module
2020-07-11 15:03:38 +02:00
Philippe GRAND
8d06471a4e
Minimum version of PHP required by module
2020-07-11 15:03:00 +02:00
Philippe GRAND
b26a1042d2
Minimum version of PHP required by module
2020-07-11 15:02:03 +02:00
Philippe GRAND
b2af2320ef
Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020
2020-07-11 14:57:26 +02:00
Philippe GRAND
a61955234f
Minimum version of PHP required by module
2020-07-11 14:54:23 +02:00
Philippe GRAND
b02b6db181
Minimum version of PHP required by module
2020-07-11 14:43:30 +02:00
Philippe GRAND
8a2db6bad5
Minimum version of PHP required by module
2020-07-11 14:42:53 +02:00
stickler-ci
0d58c55167
Fixing style errors.
2020-07-11 12:42:38 +00:00
Philippe GRAND
ece128c9c5
Minimum version of PHP required by module
2020-07-11 14:42:04 +02:00
Philippe GRAND
7c84406494
Minimum version of PHP required by module
2020-07-11 14:41:10 +02:00
Philippe GRAND
370a7bcf38
Minimum version of PHP required by module
2020-07-11 14:39:46 +02:00
Philippe GRAND
0531dd00d9
Minimum version of PHP required by module
2020-07-11 14:38:44 +02:00
Philippe GRAND
baa9c39ace
Minimum version of PHP required by module
2020-07-11 14:38:03 +02:00
Philippe GRAND
872b99be42
Minimum version of PHP required by module
2020-07-11 14:37:25 +02:00
Philippe GRAND
0fdb209045
Minimum version of PHP required by module
2020-07-11 14:36:22 +02:00
Philippe GRAND
7f5ebf2e31
Minimum version of PHP required by module
2020-07-11 14:35:36 +02:00
Philippe GRAND
c9c5d9cc70
Minimum version of PHP required by module
2020-07-11 14:34:11 +02:00
Philippe GRAND
fd01a4d154
Minimum version of PHP required by module
2020-07-11 14:31:16 +02:00
Laurent Destailleur
8b5f4fe9a6
Fix massaction delete on events
2020-07-11 12:21:53 +02:00
Laurent Destailleur
276bc4f908
Fix sql error
2020-07-11 11:21:28 +02:00
Laurent Destailleur
eede2f9944
Add telangana province for india
2020-07-11 10:39:12 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
8972271be0
Add link to stock at date page
2020-07-10 21:12:15 +02:00
Laurent Destailleur
c91236244e
Enhance Stock at date feature
2020-07-10 20:33:06 +02:00
Laurent Destailleur
a155b20b2f
Trans
2020-07-10 16:27:59 +02:00
Laurent Destailleur
a059154fdf
FIX reposition
2020-07-10 13:59:54 +02:00
Laurent Destailleur
f92f279527
FIX Navigation from bank receipts
2020-07-10 13:56:54 +02:00
Laurent Destailleur
db6ed7a646
FIX Navigation from bank receipts
2020-07-10 13:40:33 +02:00
Anthony Berton
dc8bce2f43
Update list.php
2020-07-10 11:42:59 +02:00
Laurent Destailleur
2dc1008663
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 05:21:40 +02:00
Laurent Destailleur
c3375b176d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:21:01 +02:00
Laurent Destailleur
ff5a2d459d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-10 05:20:09 +02:00
Laurent Destailleur
071b909d38
FIX Fails to retraive accounting code of social contribution sometimes
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:19:21 +02:00
Laurent Destailleur
79a6246666
FIX Fails to retraive accounting code of social contribution sometimes
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:18:46 +02:00
Laurent Destailleur
86744a2e0c
FIX Fails to retraive accounting code of social contribution sometimes
2020-07-10 05:14:54 +02:00
Laurent Destailleur
17ebdd73fe
FIX Fails to retraive accounting code of social contribution sometimes
2020-07-10 05:13:24 +02:00
Laurent Destailleur
07b2053a4b
Fix regression
2020-07-10 03:59:28 +02:00
Laurent Destailleur
bb056fc811
Fix bad return value
2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop
...
Added Hook to showOptionals Function
2020-07-10 02:54:05 +02:00
Laurent Destailleur
b6452dbbc0
Merge pull request #14196 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-10 02:51:25 +02:00
Laurent Destailleur
a36c6a8dda
FIX #14209
2020-07-10 02:46:59 +02:00
Laurent Destailleur
96efb77b8c
FIX CSS
2020-07-10 02:38:37 +02:00
Laurent Destailleur
5cf9bfcb5f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:32:54 +02:00
Laurent Destailleur
2cc7e88f8e
clean code
2020-07-10 02:32:22 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
Laurent Destailleur
7fdccf4eb8
Fix error in stripe payment if no country defined
2020-07-10 02:28:00 +02:00
Laurent Destailleur
726d7e39e6
CSS
2020-07-10 02:17:08 +02:00
Laurent Destailleur
87913e8a5c
Fix prospect before customer
2020-07-10 02:11:23 +02:00
Laurent Destailleur
e8dd99a9cd
Trans
2020-07-10 01:11:37 +02:00
Laurent Destailleur
d18188d565
Fix missing trans
2020-07-10 00:57:29 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +02:00
Laurent Destailleur
fd95551940
Fix upload of file in import module
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +02:00
gauthier
25509e74d3
FIX : order by amount ht uses wrong column
2020-07-09 17:27:14 +02:00
atm-josselin
71a5cc7522
Show label on batch card
2020-07-09 17:13:53 +02:00
Laurent Destailleur
cb7f78e9d3
Fix tpl
2020-07-09 16:25:51 +02:00
Laurent Destailleur
6b5f46624c
Fix label of AWP
2020-07-09 16:19:40 +02:00
Laurent Destailleur
b8721e0c64
FIX Change position of line in BOM
2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e
Fix extrafields ordering on PDFs
2020-07-10 00:51:41 +11:00
Laurent Destailleur
a59b37cb72
Trans
2020-07-09 15:44:42 +02:00
Laurent Destailleur
6046f1f9d6
css
2020-07-09 14:12:19 +02:00
Laurent Destailleur
e6b241a083
NEW Show tags and status in search list of website pages
2020-07-09 14:07:41 +02:00
Laurent Destailleur
b55b0e505f
FIX wrap on contract ref
2020-07-09 13:56:29 +02:00
Laurent Destailleur
46119dc786
Fix per user
2020-07-09 12:49:48 +02:00
Laurent Destailleur
0394ce1865
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-07-09 12:46:10 +02:00
Laurent Destailleur
f756864670
CSS
2020-07-09 12:44:31 +02:00
Laurent Destailleur
49faaf750f
Trans
2020-07-09 12:39:43 +02:00
Laurent Destailleur
ce1649233d
FIX CSS
2020-07-09 12:39:00 +02:00
Laurent Destailleur
a9eccd80b1
FIX CSS
2020-07-09 12:38:05 +02:00
Laurent Destailleur
b2bd90ae1a
Fix link to list of event
2020-07-09 12:33:28 +02:00
Laurent Destailleur
8589e122c6
css
2020-07-09 11:58:44 +02:00
Laurent Destailleur
9592fdb3fc
CSS
2020-07-09 11:55:16 +02:00
Laurent Destailleur
0a708e46bf
css
2020-07-09 00:46:59 +02:00
Laurent Destailleur
56c90c289a
Prepare 12.0.2
2020-07-08 18:19:20 +02:00
Laurent Destailleur
1dfd2d565b
FIX Reposition and nav
2020-07-08 18:18:47 +02:00
Laurent Destailleur
96d935832c
FIX Reposition and nav
2020-07-08 18:18:08 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
edb4aac8d3
CSS
2020-07-08 18:09:35 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Matt Sidnell
39104009ef
Updated to match inline with code received from fork
2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7
Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...
2020-07-08 14:20:59 +01:00
Laurent Dinclaux
37401df106
Improve printStdColumnContent by passing the $pdf object.
...
It isn't possible to replace the pdf edition done by this method without the $pdf object.
2020-07-08 14:48:34 +11:00
Laurent Destailleur
bec27a04ba
Trans
2020-07-07 21:16:20 +02:00
Tim Otte
a73f77cfef
Fixed same error like before
2020-07-07 12:43:15 +02:00
Laurent Dinclaux
f2adc3de4f
Fix Dolibarr/dolibarr#14181 . Limits and accuracy form not saving modified values
2020-07-07 18:03:11 +11:00
stickler-ci
e032c2f7b9
Fixing style errors.
2020-07-07 05:09:28 +00:00
Alexandre SPANGARO
e4cc3e1b2c
NEW: Add column quantity in product margin page
2020-07-07 07:05:18 +02:00
Laurent Destailleur
cb5577826d
Look and feel v13
2020-07-07 03:50:14 +02:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
67c164df07
FIX reposition was broken if url end with #anchor
2020-07-06 22:27:19 +02:00
Laurent Destailleur
33a78dbcef
FIX reposition was broken if url end with #anchor
2020-07-06 22:26:19 +02:00
Laurent Destailleur
415398fc66
Better contrast
2020-07-06 21:06:32 +02:00
Laurent Destailleur
e13d3ce657
Trans
2020-07-06 20:57:47 +02:00
Laurent Destailleur
f72a836231
Fix look and feel v12
2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a
Fix param GETPOST
2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9
Fix note in creation
2020-07-06 16:52:28 +02:00
Laurent Destailleur
61a7f54877
Fix look and field
2020-07-06 15:55:41 +02:00
Laurent Destailleur
7d7ef1e72a
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
...
Fix setup of product
2020-07-06 15:34:26 +02:00
Laurent Destailleur
471f3e66e6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 12:27:43 +02:00
Laurent Destailleur
6a41d5bba8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/projet/tasks/list.php
2020-07-06 12:27:25 +02:00
Laurent Destailleur
70c3146aba
Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link
...
NEW show links for select and multi-select in category extra field
2020-07-06 12:12:31 +02:00
Laurent Destailleur
21bec139ca
Merge pull request #14183 from FHenry/12.0
...
remove warning when date end contract line empty
2020-07-06 12:06:42 +02:00
Laurent Destailleur
b4cd670b09
Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc
...
FIX : soc filter doesn't work on task list
2020-07-06 12:05:40 +02:00
Laurent Destailleur
eb7f3b81d3
Merge pull request #14187 from atm-john/10.0_fix_email_spoofing
...
Fix email spoofing - with hidden conf
2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3
Update CMailFile.class.php
2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559
Update CMailFile.class.php
2020-07-06 12:00:14 +02:00
Laurent Destailleur
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8
Fix menu organisation.
2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851
Fix regression
2020-07-06 11:31:05 +02:00
Laurent Destailleur
1399ac9b41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-06 11:28:17 +02:00
Laurent Destailleur
053a1a2230
Fix duplicate code
2020-07-06 11:22:30 +02:00
stickler-ci
cb7b66d52c
Fixing style errors.
2020-07-06 09:19:27 +00:00
Laurent Destailleur
056aa81ed3
Fix responsive
2020-07-06 10:59:23 +02:00
gauthier
466b7e84ef
FIX : soc filter doesn't work on task list
2020-07-06 09:58:44 +02:00
Laurent Destailleur
b76828df9f
Fix use of newtoken()
2020-07-06 09:39:26 +02:00
Laurent Destailleur
9cd8c3738f
Fix trans
2020-07-05 23:18:19 +02:00
Laurent Destailleur
0d3cfe445f
Fix phpcs
2020-07-05 14:16:57 +02:00
Laurent Destailleur
776e305272
Typo
2020-07-05 13:50:21 +02:00
Laurent Destailleur
1b2cea3f9f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-05 13:32:10 +02:00
Laurent Destailleur
8df431f525
Look and feel v12
2020-07-05 13:30:56 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
54a77a604c
FIX Missing token
2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e
Look and feel v12
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5
Trans
2020-07-05 12:47:32 +02:00
Laurent Destailleur
c9e5536fbc
FIX Missing token
2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85
Look and feel v12
2020-07-05 12:46:15 +02:00
Laurent Destailleur
a0d6c9ce70
Trans
2020-07-05 12:30:04 +02:00
Laurent Destailleur
93a3efac3a
Fix phpcs
2020-07-04 19:26:51 +02:00
Laurent Destailleur
b726e96f4b
FIX Update form erased extrafields that were hidden
2020-07-04 17:09:20 +02:00
florian HENRY
03ae31eced
remove warning when date end contract line empty
2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22
remove warning when date end contract line empty
2020-07-04 16:37:11 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
6a37d12bd9
Fix sql type
2020-07-04 16:10:13 +02:00
Laurent Destailleur
9912ffd555
Fix position of button
2020-07-04 13:45:28 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06
Fix trans
2020-07-04 13:04:53 +02:00
Laurent Destailleur
dd9cb8e781
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-03 19:27:42 +02:00
Laurent Destailleur
e256ce5c4b
Debug credit transfer module
2020-07-03 19:27:23 +02:00
Laurent Destailleur
1e7daa29a5
Hide a useless option
2020-07-03 01:46:50 +02:00
Laurent Destailleur
636f1e642d
Fix param of product id to switch to list of order
2020-07-03 01:31:48 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish
2020-07-03 01:03:35 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php
2020-07-03 00:57:15 +02:00
Laurent Destailleur
4fba3ec872
Merge pull request #14115 from atm-florian/10.0
...
fix entity on supplier order
2020-07-03 00:50:51 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html
...
FIX html lost on html extrafield
2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:40:59 +02:00
oscim
ca66eac76c
Update project.class.php
...
Fix order of delete extra prev table of project
2020-07-03 00:40:15 +02:00
Laurent Destailleur
f85d240dcf
Merge pull request #14145 from oscim/patch-41
...
Update project.class.php
2020-07-03 00:39:45 +02:00
Laurent Destailleur
18fa4c4105
Update card.php
2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef
Fix syntax
2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d
fix #14143
2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227
Hotfix for an error in v12
2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-03 00:32:25 +02:00
Laurent Destailleur
751174a983
Merge pull request #14156 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-03 00:32:03 +02:00
Laurent Destailleur
9c504c1b3d
Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields
...
FIX change selected fields on company card
2020-07-03 00:30:34 +02:00
Laurent Destailleur
cae55da399
Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by
...
NEW add order by lastname and firstname by default
2020-07-03 00:29:38 +02:00
Laurent Destailleur
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop
...
NEW get all child recursively
2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php
2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop
...
FIX #14143 DynamicPrice
2020-07-03 00:25:38 +02:00
Laurent Destailleur
8109145fe3
Merge pull request #14162 from laurantines/develop
...
Update list.php in Adherents
2020-07-03 00:24:54 +02:00
Laurent Destailleur
0ea55209ae
Merge pull request #14165 from ptibogxiv/patch-345
...
FIX non numeric value on comm/card.php
2020-07-03 00:24:32 +02:00
ksar
0a13e03792
FIX : Correct ModuleBuilder left menu
2020-07-03 00:21:39 +02:00
Laurent Destailleur
70b58b5755
Merge pull request #14169 from ksar-ksar/develop
...
FIX : Correct ModuleBuilder left menu
2020-07-03 00:20:59 +02:00
Laurent Destailleur
d24c6f7a81
Merge pull request #14164 from ptibogxiv/patch-344
...
FIX takepos 12 hook
2020-07-03 00:20:28 +02:00
Laurent Destailleur
91266babea
Merge pull request #14170 from andreubisquerra/master
...
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-03 00:19:35 +02:00
Laurent Destailleur
75409e3ed0
Merge pull request #14171 from hregis/12.0_bug
...
FIX missing possibility to change entity when propal cloning
2020-07-03 00:18:35 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php
2020-07-03 00:14:22 +02:00
Laurent Destailleur
16b327f106
Debug module credit transfer
2020-07-02 15:45:11 +02:00
BENKE Charlene
b3396a6454
better look & feel icon on dropdown
2020-07-02 14:40:56 +02:00
quentin
642e75c3dd
FIX wrong origin
2020-07-02 14:16:31 +02:00
Regis Houssin
a5431a40da
FIX missing possibility to change entity when propal cloning
2020-07-02 10:16:20 +02:00
Laurent Destailleur
cfcb40dd2a
Fix scrutinizer errors
2020-07-02 03:48:32 +02:00
Laurent Destailleur
6b16f64928
Fix properties used that does not exists
2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62
Fix scrutinizer errors
2020-07-02 03:37:01 +02:00
Laurent Destailleur
26c6e2d92e
Clean code
2020-07-02 03:34:28 +02:00
andreubisquerra
452cca503a
Fixes
2020-07-02 00:11:17 +02:00
andreubisquerra
9e4d7627f3
Fix travis
2020-07-01 22:55:00 +02:00
andreubisquerra
d2a78b8aa4
Update appearance.php
2020-07-01 22:44:18 +02:00
jove@bisquerra.com
76f3724191
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-01 22:34:35 +02:00
ksar
22448b19f4
FIX : Correct ModuleBuilder left menu
2020-07-01 22:19:10 +02:00
Laurent Destailleur
ae0c738980
FIX Entry from stripe intent were reported into SEPA payments
...
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
d3c23428d5
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:01:46 +02:00
Laurent Destailleur
226c907e35
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8
Fix email spoofing - with hidden conf
2020-07-01 16:55:23 +02:00
ptibogxiv
cc132775f3
FIX non numeric value on comm/car.php
2020-07-01 16:18:19 +02:00
stickler-ci
92f4744d11
Fixing style errors.
2020-07-01 13:22:43 +00:00
ptibogxiv
5e259d26ab
FIX takepos hook
...
can add more than 1 button within 1 module
2020-07-01 15:20:42 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
quentin
d2a364eea8
NEW get all child recursively
2020-07-01 14:10:43 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
5f2486049e
Fix trans
2020-07-01 13:22:15 +02:00
Laurent Destailleur
5f37f54675
Fix warning
2020-07-01 13:16:06 +02:00
laurantines
a34c6ec7b0
Update list.php in Adherents
...
Add Address in search
2020-07-01 13:12:52 +02:00
lvessiller
caa3661eeb
NEW add order by lastname and firstname by default in get sales representatives
2020-07-01 09:16:44 +02:00
lvessiller
918e669c98
FIX change selected fields on company card
2020-06-30 16:33:18 +02:00
Laurent Destailleur
b8ea58f18c
Fix phpcs
2020-06-30 16:15:10 +02:00
Tim Otte
94a1d71fba
Hotfix for an error in v12
2020-06-30 15:20:30 +02:00
Laurent Destailleur
4baa00ba89
Fix phpcs
2020-06-30 13:20:46 +02:00
Laurent Destailleur
5afd518718
Update vat rate for Congo
2020-06-30 13:06:44 +02:00
Laurent Destailleur
4f1ac84a19
Fix can't find link to edit table plan
2020-06-30 12:07:24 +02:00
gauthier
6553c40bea
FIX : create a deposit with amount using comma didn't work
2020-06-30 11:23:55 +02:00
Laurent Destailleur
88cf904ced
Fix edit of tag of website
2020-06-30 02:50:58 +02:00
Laurent Destailleur
9bb0ef04f5
Fix upload of file in import module
2020-06-29 18:07:51 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
bb74804b74
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
2020-06-29 17:58:04 +02:00
Laurent Destailleur
f34a3785f0
FIX CSS
2020-06-29 16:02:50 +02:00
Laurent Destailleur
2d0d2e0019
FIX CSS
2020-06-29 16:02:08 +02:00
Laurent Destailleur
3d8d55a531
Fix bad path in import section
2020-06-29 14:42:09 +02:00
Laurent Destailleur
b64fc7dc3f
FIX Avoid warning when creating a module with already existing files
2020-06-29 14:37:36 +02:00
Laurent Destailleur
5b3670f300
FIX SQL syntax error when editing extrafields
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
oscim
eb22947c07
Update project.class.php
...
Fix order of delete extra prev table of project
2020-06-29 14:01:48 +02:00
Laurent Destailleur
7c5b0be6a3
FIX SQL syntax error when editing extrafields
2020-06-29 13:48:00 +02:00
Laurent Destailleur
8bb11039dc
Clean code
2020-06-29 09:56:04 +02:00
Laurent Destailleur
7c4e737668
Clean code
2020-06-29 09:53:55 +02:00
Laurent Destailleur
68b4866438
Trans
2020-06-29 09:43:39 +02:00
Laurent Destailleur
eb30f6ed1a
Prepare 12.0.1
2020-06-29 09:15:49 +02:00
Francis Appels
5d65b5f660
fix html should not do price2num
2020-06-29 09:07:54 +02:00
Laurent Destailleur
600a24346a
Some people are missing this table
2020-06-28 22:09:17 +02:00
Laurent Destailleur
a5893db106
FIX upload documents into manual ECM was reported a permission error
2020-06-28 22:05:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
70efaa4235
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-28 21:48:02 +02:00
Laurent Destailleur
95729e2375
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Laurent Destailleur
aab1358b0d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:43:46 +02:00
Laurent Destailleur
b47ae06973
Clean code
2020-06-28 21:43:34 +02:00
Laurent Destailleur
b35550a3dd
Merge pull request #14122 from TobiasSekan/CommonListForLeaveLog
...
New: Common list behavior for leave log
2020-06-28 21:30:49 +02:00
Laurent Destailleur
aa91bada07
Merge pull request #14114 from atm-maxime/new_project_task_progress_filter
...
NEW filter on progress column in task list
2020-06-28 21:22:33 +02:00
Laurent Destailleur
960512acd9
Update fournisseur.commande.class.php
...
Action with filter on rowid does not need to have test on entity
2020-06-28 21:21:35 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
...
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug
2020-06-28 21:19:11 +02:00
Laurent Destailleur
dfb7c3e194
Update fournisseur.commande.class.php
2020-06-28 21:14:49 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
...
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
df7996a8eb
Merge pull request #14126 from OPEN-DSI/fix-import-upload-file
...
FIX upload file in import module
2020-06-28 21:13:00 +02:00
Laurent Destailleur
d98c54c445
Merge pull request #14132 from aspangaro/12p2
...
FIX: SQL Problem in supplier invoice list
2020-06-28 21:11:56 +02:00
Laurent Destailleur
08b3cc5033
Merge pull request #14133 from aspangaro/12p3
...
FIX: SQL Problem in social contribution list
2020-06-28 21:11:35 +02:00
Laurent Destailleur
a11f7d1070
Update list.php
2020-06-28 21:11:25 +02:00
Laurent Destailleur
3fa98a4f01
Merge pull request #14135 from OPEN-DSI/new-export-societe-contact-region
...
NEW add region in export companies and contacts
2020-06-28 21:09:56 +02:00
Laurent Destailleur
8f409f4c58
Merge pull request #14137 from TobiasSekan/CommonListMonthlyLeaveView
...
NEW: Common behavior for monthly leave list view
2020-06-28 21:09:27 +02:00
Laurent Destailleur
0aa08edb38
Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative
...
NEW can edit and set sales representatives directly on thirdparty card
2020-06-28 21:08:24 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate
...
Fix missing translate key
2020-06-28 21:07:49 +02:00
Laurent Destailleur
2de1433818
FIX #14142
2020-06-28 21:05:36 +02:00
Laurent Destailleur
518c126abf
NEW Add a page to list Stock at a given date.
2020-06-28 20:31:07 +02:00
Laurent Destailleur
a3ae7a76b8
WIP Stock at date
2020-06-28 19:35:24 +02:00
Je2fb
245ba93895
fix #14143
2020-06-28 17:53:48 +02:00
Laurent Destailleur
d22a0f702e
WIP Stock at date
2020-06-28 17:34:30 +02:00
Francis Appels
731978fda6
FIX html lost on html extrafield
2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f
Fix load of menu when 'perm' or 'enabled' is '0'.
2020-06-27 15:27:09 +02:00
Laurent Destailleur
41c6155922
Hiden useless entry
2020-06-27 14:44:38 +02:00
Laurent Destailleur
d5324ff3db
Fix template
2020-06-27 14:41:11 +02:00
Laurent Destailleur
781f571a15
Fix template
2020-06-27 14:38:40 +02:00
Laurent Destailleur
5a4ed34c0d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 03:28:44 +02:00
Laurent Destailleur
4d01030fd9
Fix phpcs
2020-06-27 02:00:42 +02:00
Laurent Destailleur
90bcc64547
Fix phpcs
2020-06-27 01:59:08 +02:00
Laurent Destailleur
ec5cfee150
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2
Fix phpcs
2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
3655f6f407
FIX #14109
2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c
FIX #14112
2020-06-26 20:35:06 +02:00
Laurent Destailleur
8e324c36ff
Prepare 11.0.5
2020-06-26 19:39:01 +02:00
Laurent Destailleur
ee0bdde8c1
FIX Filter on status, closing opening status
2020-06-26 19:36:22 +02:00
Laurent Destailleur
d6346522b8
Code comment
2020-06-26 19:36:15 +02:00
Laurent Destailleur
be5729de23
FIX Filter on status, closing opening status
2020-06-26 19:35:09 +02:00
Laurent Destailleur
b0d46d0c4c
Code comment
2020-06-26 18:56:05 +02:00
Francis Appels
f4494db73f
Fix missing translate key
2020-06-26 17:34:11 +02:00
Laurent Destailleur
29ba9c82c3
Fix #14120
2020-06-26 17:17:13 +02:00
lvessiller
ad36447295
NEW can edit and set sales representatives directly on thirdparty card
2020-06-26 12:20:53 +02:00
stickler-ci
a8ad21c011
Fixing style errors.
2020-06-26 08:59:50 +00:00
Tobias Sekan
2bb8efa86f
Common behavior for monthly leave list view
2020-06-26 10:54:27 +02:00
gauthier
858a751eef
FIX : $_POST must be GETPOST
2020-06-26 10:51:04 +02:00
lvessiller
3eb695ffa8
NEW add region in export companies and contacts
2020-06-26 09:14:06 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
10a4188eff
Clean template
2020-06-26 01:14:24 +02:00
Alexandre SPANGARO
0c60c9fd0d
FIX: SQL Problem in social contribution list
2020-06-25 20:53:03 +02:00
Alexandre SPANGARO
62f55b8549
FIX: SQL Problem in supplier invoice list
2020-06-25 20:43:41 +02:00
lvessiller
c689b91539
FIX upload file in import module
2020-06-25 16:59:48 +02:00
Florian Mortgat
ccfe6f18fe
FIX 10.0 - fatal with postgres
...
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
stickler-ci
adb3cc72f9
Fixing style errors.
2020-06-25 12:44:57 +00:00
Tobias Sekan
289886cd29
missing update
2020-06-25 14:37:09 +02:00
Tobias Sekan
22f708b95a
Add search, sort, select for leave log view
2020-06-25 14:36:42 +02:00
Laurent Destailleur
e4922f38ab
Add missing extrafield and trigger in template invoice creation
2020-06-25 14:01:38 +02:00
Laurent Destailleur
a6ecf6dbbc
Fix syntax error
2020-06-25 12:18:57 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
18c23680f7
Fix bad object
2020-06-25 12:17:06 +02:00
Laurent Destailleur
2f5dbdc8a3
Fix bad property
2020-06-25 11:54:37 +02:00
Laurent Destailleur
bbb8c9418e
Fix bad property
2020-06-25 11:51:46 +02:00
Laurent Destailleur
e146d0fe21
Fix url
2020-06-25 02:51:14 +02:00
Laurent Destailleur
c32151d356
Prepare page for stock at date
2020-06-25 01:07:30 +02:00
Laurent Destailleur
ee5156034d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-24 20:03:40 +02:00
Laurent Destailleur
9c23890c26
Fix phpcs
2020-06-24 20:03:12 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5
FIX: SQL Problem in customer invoice list
2020-06-24 14:03:16 +02:00
Laurent Destailleur
2865d6bd15
Fix set of free product
2020-06-24 13:39:00 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
florian HENRY
77868ad2a3
fix entity on supplier order
2020-06-24 12:42:41 +02:00
florian HENRY
a7f022dcea
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2020-06-24 12:24:55 +02:00
florian HENRY
8c1af0fdb8
fix enbtoty on supplier order
2020-06-24 12:24:47 +02:00
Maxime Kohlhaas
69b320f347
New : filter on progress column in task list
2020-06-24 10:17:46 +02:00
Laurent Destailleur
b6c1cdad7c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
1762e10e69
Fix return code not returned
2020-06-24 09:55:10 +02:00
Laurent Destailleur
a854d955b8
Fix rounding
2020-06-23 16:08:31 +02:00
Laurent Destailleur
0363717476
Fix PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 16:05:00 +02:00
Laurent Destailleur
7c992eac5e
Fix option PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 15:52:17 +02:00
Laurent Destailleur
d05c60baf0
Fix css
2020-06-23 14:33:34 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006
Fix alert picto of expired services not visible
...
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
daba55762f
Fix missing filter on status enabled
2020-06-22 13:07:34 +02:00
Laurent Destailleur
84d3d633e5
Fix typo
2020-06-22 11:34:54 +02:00
Laurent Destailleur
194a094d23
Fix deletion of a thirdparty must not delete the stripe account.
2020-06-22 11:32:58 +02:00
Regis Houssin
32844a8d0c
FIX clean code
2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f
NEW show links for select and multi-select in category extra field
2020-06-22 08:57:52 +02:00
Laurent Destailleur
4cfb9dc7c5
css
2020-06-22 04:40:04 +02:00
Laurent Destailleur
058a0d4fa7
Fix look and feel v12
2020-06-22 04:27:16 +02:00
Laurent Destailleur
d816d45331
Look and feel v13
2020-06-22 04:10:13 +02:00
Laurent Destailleur
1ce5b78a6b
Fix error message not reported
2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a
FIX We force "modify" for avoid some field not modify
2020-06-21 21:10:51 +02:00
Laurent Destailleur
0139a840ae
Fix setup
2020-06-21 20:49:34 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66
FIX For better compatibility with Samba4 AD
2020-06-21 19:52:15 +02:00
Marc Guenneugues
f86f4c1e1d
Change label of checkbox to be more explicit
2020-06-21 19:02:20 +02:00
Laurent Destailleur
cdcc87a565
Fix lang
2020-06-21 15:25:34 +02:00
Laurent Destailleur
d84fbb7165
css
2020-06-20 18:59:13 +02:00
Laurent Destailleur
3a0f950ad0
Fix phpcs
2020-06-20 18:46:49 +02:00
Laurent Destailleur
bb3320f103
FIX #14104
2020-06-20 18:34:19 +02:00
Laurent Destailleur
fe1f88d2ac
FIX #14092 #14093
2020-06-20 16:09:53 +02:00
Laurent Destailleur
ccc55dcb1e
Debug Receipt printer module and reduce duplicate translation key
2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
andreubisquerra
515d18020d
Add security check
2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e
Fix travis
2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b
Printable QR
2020-06-20 12:20:53 +02:00
Laurent Destailleur
70039d0c41
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-20 12:19:36 +02:00
Laurent Destailleur
450c340cb1
Trans
2020-06-20 12:19:25 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
...
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
...
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
...
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php
2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
...
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
Laurent Destailleur
2de3eb8ac0
Fix CSS
2020-06-20 00:00:17 +02:00
Laurent Destailleur
d632f1c6b2
Fix url
2020-06-19 23:08:29 +02:00
Laurent Destailleur
d8927143fa
Fix chrome style
2020-06-19 20:01:57 +02:00
Laurent Destailleur
f24e73141e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc
FIX #13877
2020-06-19 14:50:33 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
florian HENRY
07923e0baf
fix f.fk_user_author unknow because after stange join with coma
2020-06-19 10:08:19 +02:00
florian HENRY
c2920083d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fixAdvTargetTplWarning
2020-06-19 09:49:50 +02:00
florian HENRY
29c049e358
set correct global conf
2020-06-19 09:49:43 +02:00
Laurent Destailleur
01914980d9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/notice.php
2020-06-19 00:45:06 +02:00
Laurent Destailleur
623a9db4e7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/composition/card.php
htdocs/public/notice.php
2020-06-19 00:42:20 +02:00
Laurent Destailleur
22ca5e0671
Fix XSS reported by C. Weiler <sak1.s3curity@gmail.com> in notice.php
2020-06-19 00:39:27 +02:00
Laurent Destailleur
b8c0ed13f3
Fix can't find link to generate barcode sheets
2020-06-19 00:25:59 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account
...
Related to :
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976
Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix).
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
2020-06-18 20:56:46 +02:00
florian HENRY
7fef9a813e
fix warning and clean old code about multiselect category
2020-06-18 20:03:03 +02:00
florian HENRY
a705cc41ae
fix: same feature on invoice as on orders
2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949
fix: same feature on invoice as on orders
2020-06-18 19:42:23 +02:00
Laurent Destailleur
b9218a1c4c
Debug v12
2020-06-18 19:21:21 +02:00
Laurent Destailleur
4cfe1fcd6b
Typo
2020-06-18 15:57:50 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
c1a9826455
Fix color of tags
2020-06-18 15:33:52 +02:00
Laurent Destailleur
531bfe217b
Merge fields
2020-06-18 15:11:35 +02:00
Laurent Destailleur
6e761d5c98
Can get first image from index using a path without name
2020-06-18 15:07:43 +02:00
Laurent Destailleur
c986ab95cf
FIX Edit of a time spent line
2020-06-18 14:09:43 +02:00
Laurent Destailleur
ade542eee7
Sync language
2020-06-18 10:05:00 +02:00
Laurent Destailleur
fded55ddef
Fix sepa supplier count
2020-06-18 03:44:26 +02:00
Laurent Destailleur
eef07afc90
Try to solve pb with too many columns. Merge 2 columns of amounts in 1
2020-06-18 03:32:13 +02:00
Laurent Destailleur
a4059882a9
Fix update pagination
2020-06-18 03:03:02 +02:00
Laurent Destailleur
1ed649ff28
Fix tooltip on project not visible sometimes
2020-06-18 02:50:46 +02:00
Laurent Destailleur
a5ce3ada0a
Keep feature experimental as it need a lot of change
2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee
Fix Permissions on MO and API for MO
2020-06-18 01:09:30 +02:00
Laurent Destailleur
dc70cab2cb
Fix tooltip
2020-06-17 22:29:05 +02:00
Laurent Destailleur
42860d752c
Fix templates
2020-06-17 22:11:22 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
54596d2286
FIX #13967
2020-06-17 19:26:17 +02:00
Laurent Destailleur
de5a2d738b
FIX #14001
2020-06-17 18:39:25 +02:00
Laurent Destailleur
32eaa9137c
FIX #14034
2020-06-17 18:29:29 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
adb988a18b
FIX Add missing label of event for #14094 . Still missing link to object
2020-06-17 15:45:26 +02:00
Laurent Destailleur
13cdd5bc45
FIX #14095
2020-06-17 15:42:55 +02:00
Laurent Destailleur
8f4a181380
css
2020-06-17 15:35:52 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 13:42:38 +02:00
Laurent Destailleur
fdbb6debc9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-17 13:30:43 +02:00
Laurent Destailleur
6660923e94
FIX Privilege escalation reported by wizlynx WLX-2020-011
2020-06-17 13:29:43 +02:00
Laurent Destailleur
d863f9a7ad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 13:04:34 +02:00
Laurent Destailleur
7d3c176727
Prepare convertion of field "montant" into "amount"
2020-06-17 12:45:56 +02:00
Laurent Destailleur
9f69e31950
Merge pull request #14089 from atm-quentin/NEW_hide_contract_closed_lines
...
NEW hide closed contract lines
2020-06-17 12:11:00 +02:00
Florian Mortgat
3d69a1dc70
FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
bbbcd5b6b3
Fix phpcs
2020-06-16 22:48:19 +02:00
Xebax
5d76b4781e
FIX Upload of documents for members using the REST API.
2020-06-16 22:48:14 +02:00
Laurent Destailleur
64b2a2d92f
Fix phpcs
2020-06-16 22:46:36 +02:00
Laurent Destailleur
18d20f3a0e
Merge pull request #14080 from EuskalMoneta/develop
...
FIX Upload of documents for members using the REST API.
2020-06-16 22:43:19 +02:00
Laurent Destailleur
f0e4fa40f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a
Complete #14078
2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports
...
11.0 - FIX - missing currency columns in supplier exports
2020-06-16 22:00:56 +02:00
Laurent Destailleur
cbd99ea7a2
FIX #14088
2020-06-16 21:57:49 +02:00
Laurent Destailleur
e8b44ef89e
css
2020-06-16 17:55:46 +02:00
gauthier
e50d239322
FIX : force rounding 2 on export ld compta
2020-06-16 11:40:01 +02:00
Florian Mortgat
18d5ec7750
11.0 - FIX - missing currency columns in supplier exports
...
(copy-pasted from modFacture.class.php)
2020-06-16 10:56:10 +02:00
stickler-ci
3384763c6b
Fixing style errors.
2020-06-16 08:54:50 +00:00
atm-quentin
e3d94d44ab
NEW hide closed contract lines
2020-06-16 10:45:49 +02:00
Laurent Destailleur
9ec8051a37
NEW Add param to not show links when output tags
2020-06-16 02:56:48 +02:00
Laurent Destailleur
e28bbfbd63
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-15 16:10:49 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
7b64e8643f
Trans and css
2020-06-15 16:08:48 +02:00
Laurent Destailleur
40e16672e3
FIX BlindBoolean SQL injection reported by Christian Weiler
...
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
1736ecfa26
Fix phpcs
2020-06-15 04:32:59 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507
Fix escape fields
2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658
Fix rounding
2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174
Fix supplier sepa
2020-06-14 21:49:12 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
Laurent Destailleur
abb8cd260f
Fix escape fields
2020-06-14 21:22:44 +02:00
Laurent Destailleur
c22a9781d8
Fix rounding
2020-06-14 21:21:18 +02:00
Laurent Destailleur
f0ca29cc6e
Fix supplier sepa
2020-06-14 21:19:31 +02:00
Xebax
a22c89da96
FIX Upload of documents for members using the REST API.
2020-06-14 14:58:09 +02:00
stickler-ci
79a7e4c149
Fixing style errors.
2020-06-13 07:44:48 +00:00
DEMAREST Maxime (Indelog)
9217ec47dc
Fix replace loan_calcmens() by loanCalcMonthlyPayment()
2020-06-13 09:33:02 +02:00
DEMAREST Maxime (Indelog)
44445ff9e6
Fix stickler
2020-06-13 09:32:54 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
b763b40d8c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66
Prepare v12
2020-06-12 19:30:23 +02:00
Laurent Destailleur
b7e7ccee54
Update demo
2020-06-12 18:55:36 +02:00
Laurent Destailleur
c90ab62989
Fix We must include version into filename
2020-06-12 15:31:12 +02:00
Laurent Destailleur
2a20fc3968
Fix missing author into export_alias
2020-06-12 15:27:28 +02:00
Laurent Destailleur
c9cb978c39
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 15:21:06 +02:00
Laurent Destailleur
9bb5135317
Fix We never add .noexe of files into medias dir
2020-06-12 15:20:28 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf
...
FIX : percent must be displayed on one line
2020-06-12 14:50:49 +02:00
Laurent Destailleur
acd0abf1ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:34 +02:00
Laurent Destailleur
6e81542148
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:11 +02:00
Laurent Destailleur
5d5fb46af6
Fix We never add .noexe of files into medias dir
2020-06-12 14:35:50 +02:00
Laurent Destailleur
1ba03566dc
Fix case of delete contact not correctly implemented.
2020-06-12 02:15:02 +02:00
Laurent Destailleur
cc9a964b5d
Update products.lang
2020-06-12 01:58:47 +02:00
Laurent Destailleur
a0b6d9c4e0
css
2020-06-12 01:19:50 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql
2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql
2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-12 01:00:15 +02:00
Laurent Destailleur
012574b487
Update html.form.class.php
2020-06-12 00:51:19 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343
...
NEW convert all subscription in datetime
2020-06-12 00:47:55 +02:00
Laurent Destailleur
d7cbd8a1d4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Laurent Destailleur
0023d14e65
Merge pull request #14037 from OPEN-DSI/v10-fix-takepos-free-text-html
...
FIX free text on cash desk
2020-06-11 23:33:31 +02:00
Laurent Destailleur
3527d011f5
Merge pull request #14006 from bafbes/abb110215
...
fix:The label must be a dictionary key
2020-06-11 23:15:52 +02:00
Laurent Destailleur
4b47a270af
Update index.php
2020-06-11 23:15:00 +02:00
Laurent Destailleur
073a4acd10
Merge pull request #14058 from indelog/showmailpj
...
NEW Add show preview for mail attachement on form mail
2020-06-11 23:09:26 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation
...
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-11 23:05:55 +02:00
Laurent Destailleur
83df96f7d1
Merge pull request #14054 from OPEN-DSI/fix-takepos-terminal-free-text
...
FIX replace filter parameter "none" by "restricthtml" on cash desk
2020-06-11 23:02:46 +02:00
Laurent Destailleur
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat
...
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring
...
Fix 11.0 - undef func measuringUnitString() in From::select_produits_fournis…
2020-06-11 23:02:01 +02:00
Laurent Destailleur
7d4a7a4be0
Merge pull request #14067 from atm-john/11.0_fix_ticket_file_save
...
Fix ticket file save
2020-06-11 23:01:33 +02:00
Laurent Destailleur
f1f37c7b29
Merge pull request #14064 from atm-florianm/FIX_11.0_postgresql_fatal_on_contact_agenda
...
FIX 11.0 - fatal with postgres on contact/agenda.php
2020-06-11 23:01:01 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php
2020-06-11 22:58:58 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql
2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:44:38 +02:00
Anthony Berton
94e7fc20be
Create html.form.class.php
2020-06-11 18:41:52 +02:00
Anthony Berton
ce7767a154
Create 11.0.0-12.0.0.sql
2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:37:25 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
Laurent Destailleur
c70cd01971
Fix css
2020-06-11 17:58:00 +02:00
Laurent Destailleur
3831b56423
Missing tags
2020-06-11 17:07:41 +02:00
Laurent Destailleur
78204f92e6
Fix tag
2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a
Fix tag at bad place
2020-06-11 16:59:24 +02:00
Regis Houssin
997cb214f1
FIX avoid error "Call to undefined function measuringUnitString()"
2020-06-11 16:52:24 +02:00
Laurent Destailleur
503206af88
Fix analytics tag
2020-06-11 16:38:58 +02:00
Anthony Berton
4a77d06b1e
o
2020-06-11 15:45:31 +02:00
Anthony Berton
182a34616f
Add files via upload
2020-06-11 15:39:05 +02:00
Anthony Berton
848c9df537
Add files via upload
2020-06-11 15:38:05 +02:00
Anthony Berton
9d43827844
Revert "Delete html.form.class.php"
...
This reverts commit aa275f2a79 .
2020-06-11 15:18:10 +02:00
Laurent Destailleur
a48f263af2
Fix phpcs
2020-06-11 13:58:12 +02:00
Laurent Destailleur
5bc9e656bf
Fix phpcs
2020-06-11 13:03:21 +02:00
Laurent Destailleur
6a3547f8af
css
2020-06-11 02:11:17 +02:00
Laurent Destailleur
5b882e333d
Fix tooltip on localtaxes
2020-06-10 23:00:17 +02:00
Laurent Destailleur
e94ef09977
css
2020-06-10 22:24:15 +02:00
Laurent Destailleur
5e13a7f1e2
css
2020-06-10 22:05:49 +02:00
ATM john
564b9df1e7
Fix ticket file save
2020-06-10 17:01:57 +02:00
gauthier
58ff96af30
FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php
2020-06-10 16:48:02 +02:00
Florian Mortgat
5bc80f8626
FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax
2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d
FIX Sharing buttons
2020-06-10 12:45:02 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
764b8a15de
FIX Sharing buttons
2020-06-10 00:01:41 +02:00
Laurent Destailleur
4b2a570a23
Error message
2020-06-09 22:44:25 +02:00