ATM-Nicolas
73c3529831
NEW : Display price HT on all commercial area boards
2018-05-02 14:36:55 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Laurent Destailleur
32ace6a8cf
NEW Add hook setContentSecurityPolicy
2018-04-30 15:17:38 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Regis Houssin
2906358383
Fix: use "socpeople" instead "societe"
2018-04-27 10:42:10 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
46e448a086
Fix default agenda view
2018-04-22 17:57:20 +02:00
Laurent Destailleur
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e
FIX key in getEntity for supplier proposals
2018-04-21 14:41:31 +02:00
Laurent Destailleur
c81c744aaf
Clean deprecated var
2018-04-21 13:14:58 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
38d200d8a6
Fix left menu
2018-04-20 13:23:34 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
florian HENRY
ad403c7045
fix syntax and uniformize code
2018-04-14 17:04:38 +02:00
Laurent Destailleur
86112f0096
Syntax error
2018-04-13 14:15:33 +02:00
Laurent Destailleur
d4cd5a0d95
Fix syntax error
2018-04-13 13:37:43 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
4d94327ead
Look and feel v8
2018-04-07 16:17:40 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
ee870342ef
Fix navigation/translation
2018-04-06 20:22:20 +02:00
Laurent Destailleur
1009a629d9
Try better Fix for #8432
2018-04-06 13:20:09 +02:00
Laurent Destailleur
2207e5e470
Fix tooltip
2018-04-05 19:23:36 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Marc de Lima Lucio
c2d3e2a701
NEW: generalize button to create object from list, for the remaining lists
2018-04-03 15:28:12 +02:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
b6e9e0e287
Fix missing hooks
2018-03-30 16:44:58 +02:00
Laurent Destailleur
6ccdb52229
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-29 13:30:22 +02:00
Laurent Destailleur
072b6c02c0
FIX Test on mandatory status when closing proposal failed
2018-03-29 13:25:03 +02:00
Laurent Destailleur
b806b85761
Fix field filtert is set twice
2018-03-29 11:15:50 +02:00
Laurent Destailleur
6ef1dbbe0f
FIX auto open contract if one result found
2018-03-24 18:28:06 +01:00
Laurent Destailleur
630ed04e17
FIX missing properties in last contract list
2018-03-24 13:15:00 +01:00
Laurent Destailleur
6e52c896f2
Dolibarrize module ticket
2018-03-22 10:46:42 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
e639f2a91f
Removed deprecated method classer_facturee(). Duplicate of
...
classifyBilled
2018-03-16 10:51:12 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
0258d3aeeb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 18:04:59 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response
...
the fk_element don't display when the call is made with REST API (reason non found)
2018-03-13 10:28:44 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Laurent Destailleur
a3d25b24d3
FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}
2018-03-11 19:27:03 +01:00
Laurent Destailleur
4070d78d13
Fix phpcs
2018-03-11 02:18:46 +01:00
Laurent Destailleur
7f469e9f6f
Fix PHPCS
2018-03-11 02:04:08 +01:00
Alexis Algoud
129c032118
NEW hidden conf to set nb weeks to show into user view
2018-03-10 16:46:57 +01:00
Laurent Destailleur
466f87ee15
Merge pull request #8322 from inoveaconseil/develop
...
Add research with phone number on left search
2018-03-10 11:20:16 +01:00
Inovea Conseil
9075ed4107
Add mass action proposal closed
2018-03-10 00:04:58 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink
...
7.0 betterthirdpartylink
2018-03-09 23:03:23 +01:00
florian HENRY
a34709c112
fix better thirdparty link
2018-03-09 22:36:00 +01:00
Regis Houssin
ea175cd6c1
Fix: compatibility with multicompany dictionnary sharing
2018-03-09 09:37:23 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
7e3b118257
Standardize output
2018-03-07 12:03:40 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
f800d50fec
WIP to show event per hours
2018-03-07 11:53:30 +01:00
Laurent Destailleur
a0a9e12178
Fix css
2018-03-07 11:29:50 +01:00
Laurent Destailleur
1a5cc4e516
Fix in edit mode, title of event is required
2018-03-07 11:06:14 +01:00
Laurent Destailleur
f3fd5f4cfa
FIX Label of event show twice
2018-03-07 11:03:35 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Marc de Lima Lucio
6a4a3c9e82
NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL
2018-03-05 10:58:19 +01:00
Laurent Destailleur
864edce665
NEW Accept anonmymous events (no user assigned)
...
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
191a1e9350
Fix css
2018-03-02 11:18:29 +01:00
Laurent Destailleur
a3350d12d8
css
2018-03-01 23:51:06 +01:00
Laurent Destailleur
0f237e4d5c
NEW Add mass action enable/disable on cron job list
2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf
CSS
2018-03-01 02:37:18 +01:00
Laurent Destailleur
f545d2a134
NEW Can add filter actiontype and notactiontype on event ical export
2018-02-28 20:06:28 +01:00
Laurent Destailleur
c8e6a8c014
Fix look and feel v7
2018-02-27 22:17:42 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Marc de Lima Lucio
7ca5ac03cc
FIX: discount card: only display relevant discounts types (customer/supplier)
2018-02-26 17:40:31 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
...
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
John
bd0e8506f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-02-21 11:53:16 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
John
09c5dc506a
Add html dom element and fix class
2018-02-20 17:46:32 +01:00
John
5624257a6d
add new dom html5 elements and class
2018-02-20 16:49:49 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
fa0c65e37e
FIX: supplier credit notes: correctly handle discount split
2018-02-16 12:05:36 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
78697c1735
USe fk_product is better than ref
2018-02-14 21:14:24 +01:00
Marc de Lima Lucio
daca27b2ed
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
2018-02-14 18:02:40 +01:00
Laurent Destailleur
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Romain DESCHAMPS
8e42ed5824
add missing links in cust. card boxes
2018-02-12 02:40:13 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
9c954de081
Error management
2018-02-08 14:25:44 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
b364b2a4de
Fix selection of filter in agenda views
2018-02-06 01:16:51 +01:00
Laurent Destailleur
074f4a3b46
Fix class not found when selecting project ref in lists
2018-02-06 00:34:14 +01:00
Laurent Destailleur
b063c19084
Fix: object project not defined
2018-02-06 00:19:40 +01:00
Laurent Destailleur
2fbe4637ac
Fix bad filter link
2018-02-05 23:05:37 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
0e3d5ea9e5
Fix missing translation
2018-02-04 11:44:39 +01:00
Laurent Destailleur
b3df7670e9
Merge pull request #7999 from frederic34/propalweight
...
NEW display weight volume in propal
2018-02-03 16:58:58 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
9c6b6f244c
Fix tooltip on invoice
2018-02-01 01:25:45 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
c67e57836e
Code comment
2018-01-29 12:58:33 +01:00
Laurent Destailleur
0a11d52d53
Fix info on email sent
2018-01-29 12:46:07 +01:00
Laurent Destailleur
f2a3c83053
Better error messages
2018-01-27 18:46:52 +01:00
Laurent Destailleur
ba0a96c882
Missing param limit
2018-01-26 15:37:23 +01:00
Laurent Destailleur
c5307e5cac
Fix option MAILING_LIMIT_SENDBYWEB
2018-01-26 15:12:40 +01:00
Maxime Kohlhaas
6f248a6590
New allow to define order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
fd6f0a4494
Fix use constant for status
2018-01-20 13:03:18 +01:00
Jan Giebels
d01a8d0508
Added order status =1 or =2 for overview
2018-01-19 11:22:25 +01:00
Laurent Destailleur
59eefa46e6
Fix duplicate search field
2018-01-16 18:02:36 +01:00
Laurent Destailleur
1f2d275ef2
Fix conditions of some fields
2018-01-13 17:21:56 +01:00
Laurent Destailleur
53b36435d0
Fix on smartphone
2018-01-12 20:50:18 +01:00
Laurent Destailleur
a44363ce3d
Fix responsive
2018-01-12 14:41:57 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
Laurent Destailleur
9f79ad800b
Fix price per quantity
2018-01-09 14:20:47 +01:00
Laurent Destailleur
42e659e26c
Fix link for online payment
2018-01-08 13:21:04 +01:00
Laurent Destailleur
1e438b7ebd
Fix travis and return of api that change status
2018-01-05 02:01:57 +01:00
Laurent Destailleur
d7837f8800
Try fix for #7778
2018-01-05 01:43:51 +01:00
Laurent Destailleur
45ed5c20ea
Merge pull request #8011 from frederic34/patch-1
...
Update card.php
2018-01-04 23:57:53 +01:00
Laurent Destailleur
dd8e7d657f
Update card.php
2018-01-04 23:57:45 +01:00
Laurent Destailleur
f19fb90ab0
Merge #8008 manually
2018-01-04 23:36:14 +01:00
Laurent Destailleur
f6007045f5
Fix search filters
2018-01-04 00:23:08 +01:00
Laurent Destailleur
6bc8268dc5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-01-03 23:35:15 +01:00
Frédéric FRANCE
aaff13a984
Update card.php
2018-01-02 14:28:52 +01:00
Frédéric FRANCE
33f6ba19da
display weight volume in propal
2017-12-28 16:20:08 +01:00
Laurent Destailleur
77be56ff74
Merge pull request #7991 from defrance/patch-103
...
Add project column on proposal list
2017-12-28 13:03:03 +01:00
Laurent Destailleur
af8ebc616b
Update list.php
2017-12-28 13:02:26 +01:00
Laurent Destailleur
9ac99caffe
Merge pull request #7995 from frederic34/patch-1
...
Update propal.class.php
2017-12-28 12:51:44 +01:00
Laurent Destailleur
b0fefffcf8
Fix standardize api code
2017-12-28 12:44:15 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0
2017-12-28 08:46:22 +01:00
Frédéric FRANCE
80618d56ac
Update propal.class.php
2017-12-26 16:12:28 +01:00
Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
BENKE Charlene
df884e4080
Add project column on proposal list
...
if project are not enabled we don't display it
2017-12-23 18:37:08 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
4a5988accb
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 12:52:19 +01:00
Laurent Destailleur
b03d0134a7
Filter on date extrafield timestamp and datetime disabled (not possible
...
yet)
2017-12-20 18:30:41 +01:00
Laurent Destailleur
3635e88396
Update api_proposals.class.php
2017-12-19 18:01:38 +01:00
Neil Orley
e90183f4ba
NEW Update end of validity date of proposal using the API
...
Add the ability to update the end of validity date when modifying a proposal
2017-12-19 12:37:37 +01:00
Neil Orley
fe8fac9577
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-19 12:36:46 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Neil Orley
d8dac909d6
NEW Add error message
...
Returns the error message when the API can't add a new line in a proposal
2017-12-18 14:36:41 +01:00
Neil Orley
4c852d1b6f
NEW Set a proposal to draft
...
Set a proposal to draft
2017-12-15 16:34:30 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54
Fix several pb in links to projects on create page
2017-12-12 10:37:51 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
09d3db145b
Merge
2017-12-08 13:10:13 +01:00
Regis Houssin
1b16eb731d
Fix: missing load product translation file
2017-12-08 11:00:23 +01:00
Regis Houssin
1bdffa961f
Fix: wrong translation if multilang activated
2017-12-08 10:41:14 +01:00
Laurent Destailleur
50150cf897
Merge pull request #7918 from atm-maxime/develop
...
Fix scrutinizer
2017-12-08 10:35:24 +01:00
Maxime Kohlhaas
8a39e2a413
Fix : no need for action button on cards, link is now available
2017-12-07 00:36:23 +01:00
Maxime Kohlhaas
0fa77160d9
Fix scrutinizer
2017-12-06 23:21:58 +01:00
Laurent Destailleur
2e2ab54d19
Fix parameter in delete line
2017-12-03 20:51:26 +01:00
Laurent Destailleur
1f4a079f01
Fix bug reported by scrutinizers
2017-12-02 15:03:14 +01:00
Laurent Destailleur
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +01:00
Laurent Destailleur
0a73daba01
Security: on target=_blank, we must have rel="noopener"
2017-12-02 03:04:52 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
c269dcc4d5
Fix scrutinizer
2017-11-29 17:58:13 +01:00
Laurent Destailleur
682afe8918
Fix scrutinizer
2017-11-29 16:25:12 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
944d666d1a
Fix bugs
2017-11-25 11:27:24 +01:00
Laurent Destailleur
4cff4c6935
Simplify and standardize code for agenda pages
2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70
NEW Remove background on agenda view when event is a not busy event.
2017-11-24 20:02:46 +01:00
Laurent Destailleur
b052722cf1
Merge pull request #7861 from hregis/develop_member
...
Fix: wrong table name and id field name
2017-11-24 16:36:22 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Regis Houssin
2a7b04e795
Fix: wrong table name and id field name
2017-11-23 12:18:49 +01:00
Laurent Destailleur
5b77fe393e
Fix: contact not preselected
2017-11-23 00:59:43 +01:00
Laurent Destailleur
adce4b5b7b
Debug multi contact on event.
...
Prepare also code to manage properties of attendees of event
2017-11-22 14:42:47 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact
...
New multi contacts on actioncomm
2017-11-22 12:05:04 +01:00
Laurent Destailleur
46d1318a32
Merge pull request #7828 from papoteur-mga/develop
...
Fix:[proposals]Allow lines to be added from REST API
2017-11-22 11:16:32 +01:00
Laurent Destailleur
ff9a62e519
Fix trackid from emailings
2017-11-21 11:15:33 +01:00
Papoteur
dfffd7497e
Correction of the previous commit.
...
Place the convertion into object at the good place.
2017-11-19 11:46:34 +01:00
Papoteur
f3f182b5bc
[proposals]Allow lines to be added from REST API
...
Prevously, only void lines was added. Need to convert array lines to object in this case.
2017-11-18 16:21:54 +01:00
atm-ph
fbc761cbac
Fix rename TContactId into socpeopleassigned
2017-11-18 12:36:03 +01:00
atm-ph
15a8f2037b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-11-18 11:54:21 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
481b810fd2
Merge pull request #7810 from frederic34/patch-1
...
fix trigger when module not enabled
2017-11-17 12:59:59 +01:00
Laurent Destailleur
4f25bc5e3b
NEW detection of edge browser
2017-11-16 14:44:55 +01:00
Frédéric FRANCE
0d79cc50b0
Merge remote-tracking branch 'upstream/develop' into patch-1
2017-11-16 13:41:24 +01:00
Laurent Destailleur
a7aa3ee438
Rename file
2017-11-16 12:21:21 +01:00
Laurent Destailleur
c527189088
Standardize page name
2017-11-16 12:18:25 +01:00
Laurent Destailleur
19d0283b63
Fix doxygen
2017-11-16 12:13:23 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
0e2f64af72
CSS
2017-11-14 12:18:02 +01:00
Laurent Destailleur
fa92c53ff6
Fix pb when showing dictionaries
2017-11-14 11:13:24 +01:00
Frédéric FRANCE
96031b0787
Update listactions.php
2017-11-14 11:05:58 +01:00
Laurent Destailleur
11cb9c0d81
Code simpler
2017-11-14 01:57:50 +01:00
Laurent Destailleur
d0d1d646fd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-14 01:35:16 +01:00
Laurent Destailleur
3dc06977af
Update listactions.php
2017-11-14 01:33:44 +01:00
Laurent Destailleur
a12186a0b8
Use HTTP response code 304 instead of 500 when nothing is done
2017-11-14 01:26:02 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
1a5bbef266
FIX Locatax were not propagated when cloning order or proposal
2017-11-13 13:07:31 +01:00
alexis Algoud
19a2c2fe06
Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop
2017-11-13 10:05:29 +01:00
Laurent Destailleur
9a8423ba5e
Start to show work on repeat events
2017-11-13 02:46:13 +01:00
Laurent Destailleur
90615a8682
Fix busy tag not set sometimes
2017-11-13 02:44:02 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Alexis Algoud
7922fd0281
NEW add burger menu to list action comm
2017-11-11 18:41:35 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
d938a56282
Clean code
2017-11-11 01:10:17 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
a329f7dc75
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
2017-11-05 18:50:14 +01:00
Laurent Destailleur
d3a0cff30a
Merge pull request #7755 from frederic34/currency
...
default currency on propal create
2017-11-05 18:28:40 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
Laurent Destailleur
048766bd24
Fix sql error
2017-11-03 17:24:14 +01:00
Laurent Destailleur
c479efa480
Fix encoding with select2
2017-11-03 16:29:23 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create
2017-11-02 18:14:55 +01:00
gauthier
03544f783a
FIX : Wrong alias sql
2017-11-02 16:16:29 +01:00
Laurent Destailleur
310bf4bde4
Update peruser.php
2017-11-02 15:51:35 +01:00
Laurent Destailleur
ec3a07cd52
Try to restore compatibility when actioncode=CODE1,CODE2,...
2017-11-02 15:50:55 +01:00
Laurent Destailleur
63a363080e
Update index.php
2017-11-02 15:48:56 +01:00
Laurent Destailleur
323a0d7d0d
Update index.php
2017-11-02 15:48:24 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
gauthier
b7cf434ebd
FIX : Filter type on actioncomm with multiselect doesn't work
2017-11-02 14:58:33 +01:00
Laurent Destailleur
c226fc69d1
Update actioncomm.class.php
2017-11-02 10:45:27 +01:00
Laurent Destailleur
4220d02dd4
Debug module blocked log
2017-10-31 23:57:37 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Laurent Destailleur
b29f32171c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
cd5e43483e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
f02e731c67
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/project.lib.php
2017-10-27 02:32:09 +02:00
Laurent Destailleur
708666349f
Minor fix
2017-10-26 18:35:32 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
fb843430bf
FIX #7671
2017-10-22 03:22:31 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Juanjo Menent
75580f253e
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
2017-10-20 12:57:32 +02:00
Laurent Destailleur
f7556e7ad2
FIX make of link to other object during creation
2017-10-19 19:06:48 +02:00
TuxGasy
9c3805c0d5
Fix anchor after add line
2017-10-19 14:10:58 +02:00
Laurent Destailleur
93d16bf4d7
Fix several fixes in APIs
2017-10-19 12:30:36 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
74b401b70d
Fix bad perm to delete file
2017-10-18 17:40:47 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
66538c7c0f
Position of method
2017-10-18 11:34:49 +02:00
Laurent Destailleur
037b90f2f3
NEW The comment when closing a proposal is added to commercial proposal
2017-10-18 11:23:16 +02:00
Laurent Destailleur
b124c7f16d
Clean params
2017-10-18 11:15:54 +02:00
Laurent Destailleur
000c1bddb2
Fix we lose the private not when closing proposal
2017-10-18 11:12:59 +02:00
Laurent Destailleur
d40dda83cf
Add API "close" for proposals
...
Standardize code
2017-10-18 11:10:08 +02:00
Laurent Destailleur
eb1fdca157
NEW Can create intervention from a proposal
2017-10-17 10:44:18 +02:00
Laurent Destailleur
082d59439f
Fix add missing seconds when adding event so sort order on date is ok
2017-10-17 10:43:37 +02:00
Laurent Destailleur
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-10-13 09:52:56 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Laurent Destailleur
af1d2bfffd
Standardize code
2017-10-07 14:11:01 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
8d47969d29
Merge pull request #7578 from OPEN-DSI/fix_0002
...
NEW add a new notification for the signed closed event of a proposal.
2017-10-06 17:36:23 +02:00
KHELIFA
88ab3a9cab
Add a new notification for the event that has successfully closed a proposal.
2017-10-06 16:15:40 +02:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
Laurent Destailleur
ed467aa74b
FIX Only modified values must be modified
2017-10-06 15:01:31 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
3f3a5e0921
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
...
New custom meteo
2017-10-02 00:48:52 +02:00
Laurent Destailleur
0e15aef44f
CSS
2017-09-30 00:30:58 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Laurent Destailleur
f510f3062b
Clean param type
2017-09-28 17:41:18 +02:00
Laurent Destailleur
30a9e40f4e
Fix position of fields
2017-09-28 17:29:37 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
gauthier
1694737e0b
NEW : new param on load_board() function in ActionComm class to avoid duplicate code
2017-09-27 10:09:21 +02:00
Laurent Destailleur
36b199e78c
Merge pull request #7433 from tysauron/patch-11
...
For use ajax combobox for societe and contacts in action card create.
2017-09-26 20:13:52 +02:00
gauthier
7f938bc517
NEW : unexistant function load_state_board() on several objects
2017-09-26 12:32:58 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
adb3827d1e
FIX #7475
2017-09-24 22:55:27 +02:00
Laurent Destailleur
3a7aea48d7
FIX #7475
2017-09-24 22:38:18 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
e56840b9ec
Clean deprecated code
2017-09-21 11:35:18 +02:00
Laurent Destailleur
d71916af7b
Merge pull request #7437 from tysauron/patch-12
...
Rename "->fk_action" in "->type_id"
2017-09-21 11:26:38 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
tysauron
5643d4e867
Rename "->fk_action" in "->type_id"
...
(is old name)
2017-09-19 17:26:18 +02:00
tysauron
0803e03ca9
For use ajax combobox for societe and contacts in action card create.
2017-09-19 14:53:34 +02:00
Laurent Destailleur
1e33495f42
Fix remove warnings
2017-09-19 00:31:51 +02:00
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
fa18e788b5
Fix must use photo of user
2017-09-17 17:29:00 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +02:00
Laurent Destailleur
0cf67944fa
Clean code
2017-09-16 13:14:46 +02:00
Laurent Destailleur
bd7c4fe940
NEW Summary of last events on a card are sorted on decreasing date.
2017-09-16 10:12:44 +02:00
Laurent Destailleur
b13dbf1f06
Clean code. Make selection of template working even if public.
2017-09-16 00:49:46 +02:00
Laurent Destailleur
2fcedcad74
Merge pull request #7410 from atm-florian/dev_better_propal_singend_form
...
NEW: confirm form style to accept or reject proposal
2017-09-15 18:58:25 +02:00
Laurent Destailleur
b63b0933e7
Update card.php
2017-09-15 18:57:39 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
florian HENRY
c9df299418
NEW: confirm form style to accept or reject proposal
2017-09-15 16:06:25 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
1a78e2a055
Mutualize/share code of all payments modes
2017-09-15 13:43:16 +02:00
florian HENRY
8b9b99ac40
fix : advance target emailing
2017-09-15 13:02:49 +02:00
Laurent Destailleur
e254554461
Code comment
2017-09-15 11:28:21 +02:00
Laurent Destailleur
1ffcb5d94e
FIX background color not visible in emailing view
2017-09-15 11:24:32 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
3b40c95107
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
2017-09-14 21:57:14 +02:00
Laurent Destailleur
c52e593ea8
Fix this->db
2017-09-14 21:27:14 +02:00
Laurent Destailleur
ed9c401ca6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 12:20:26 +02:00
Laurent Destailleur
a38bbdcc05
Merge pull request #7382 from hregis/6.0_bug3
...
Fix: hide bank account field if module disabled
2017-09-14 12:14:45 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
939d33cce7
Fix bug reported by scrutinizer
2017-09-12 19:12:39 +02:00
Laurent Destailleur
47d2350ad4
Fix bugs reported by scrutinizer
2017-09-12 19:03:12 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
Regis Houssin
cd888a2149
Fix: hide bank account field if module disabled
2017-09-12 15:13:12 +02:00
Laurent Destailleur
5dcbebbd46
NEW Add filters on month/year on the accountancy binding tools
2017-09-12 13:48:45 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
c5567fafd4
Enhancement for smartphone
2017-09-04 09:25:53 +02:00
Laurent Destailleur
e549e6cde1
Error management
2017-09-03 04:16:43 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
61cf69f2bb
NEW Include a color syntaxed HTML editor for emailing edition.
2017-09-01 13:09:13 +02:00
atm-ph
8188abd4cd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-08-31 11:09:02 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
d3c95e030b
Fix delete file not possible for external user even with permissions
2017-08-30 14:34:36 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14
Fix substitution of __EMAIL__
2017-08-28 12:49:57 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
4052e15565
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/comm/action/card.php
2017-08-26 21:58:29 +02:00
Laurent Destailleur
54cc1ac800
Merge emailing target selectors.
2017-08-25 21:20:27 +02:00
Laurent Destailleur
d108d04add
NEW Can filter on the "other" column on emailing target list
2017-08-25 19:26:48 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Regis Houssin
18ca96e285
Fix: file delete link doesn't work
2017-08-22 18:33:00 +02:00
Laurent Destailleur
2104ab9aed
Disable event reminder
2017-08-21 13:11:29 +02:00
Laurent Destailleur
8cd2235b4b
Start to introduce cron for email reminder.
2017-08-03 11:42:22 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
47ac770d93
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/expedition/card.php
htdocs/expedition/list.php
2017-08-02 17:51:19 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
ddee802324
Add second parameter in GETPOST
2017-08-01 10:22:09 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
cfebbe3cc4
Fix css
2017-07-31 03:16:28 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
837afa0e65
Fix better way to get info for contact/thirdparty on agenda
2017-07-29 04:07:46 +02:00
Laurent Destailleur
2a36166839
Fix error method on non object
2017-07-29 02:11:45 +02:00
Laurent Destailleur
cae21d3937
Fix in agenda output per user/type (reduce memory usage)
2017-07-29 01:59:26 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
dafe1194c4
Merge pull request #7100 from tuxgasy/develop_addmoresummary_hook
...
Close: add new hook addMoreBoxStatsCustomer
2017-07-25 20:32:10 +02:00
Laurent Destailleur
f4857af7aa
Update card.php
2017-07-25 20:31:41 +02:00
Laurent Destailleur
cba898e2b9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
phf
885fc3c5b7
Fix lost search value in list if come from thirdparty card
2017-07-17 11:04:48 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
312b153005
Fix phpcs
2017-07-13 23:46:01 +02:00
Laurent Destailleur
4ee70e496e
Merge pull request #7143 from hregis/6.0_bug
...
Fix: missing entity filter (multicompany)
2017-07-13 14:33:45 +02:00
Laurent Destailleur
bea3ced763
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-07-13 14:32:03 +02:00
Laurent Destailleur
58ce8eaf46
Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing
...
Fix AdvtargetEmailing
2017-07-13 14:26:23 +02:00
Laurent Destailleur
743de4e586
FIX Option to classify proposal/order in workflow module must not set
...
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
028f1f5133
Fix default currency in creation form.
2017-07-13 10:16:40 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Laurent Destailleur
4b4dcf2e01
Fix overload with a protection for rare case with very high nb of event
2017-07-12 23:05:26 +02:00
florian HENRY
816283d1e5
fix SQL
2017-07-12 17:51:32 +02:00
florian HENRY
67664331e3
Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing
2017-07-12 17:49:44 +02:00
Regis Houssin
9430952561
Fix: missing entity filter (multicompany)
2017-07-12 11:00:18 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
florian HENRY
c85bf18f0e
Fix AdvtargetEmailing
2017-07-11 14:47:37 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
e1ba69eee0
Fix edit of automatic event should keep its type.
2017-07-08 00:19:30 +02:00
Laurent Destailleur
34d0c79e32
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
...
New add trigger disable to updateline functions
2017-07-07 20:30:04 +02:00
Laurent Destailleur
640f66f017
Fix SQL syntax
2017-07-07 17:34:56 +02:00
Laurent Destailleur
de1a7042d4
Fix filter on list of actions
2017-07-07 10:55:42 +02:00
fappels
6effcb0829
New add trigger disable to updateline functions
2017-07-06 16:26:15 +02:00
TuxGasy
bec5bde363
Move addMoreBoxStatsCustomer after table tag
2017-07-06 12:18:54 +02:00
phf
49b8689f2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-07-05 11:02:39 +02:00
TuxGasy
67f11103a3
fix indent
2017-07-04 21:56:47 +02:00
Laurent Destailleur
0ee93fb00c
Fix conflict between option login and logina and logint in agenda export
2017-07-04 10:29:38 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
TuxGasy
1f9bd2538e
new addMoreBoxStatsCustomer hook
2017-07-02 22:20:07 +02:00
Laurent Destailleur
7ae52d843c
Look and feel v6
2017-07-01 14:23:24 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
b6002bd1f8
Fix bad link
2017-06-28 18:29:57 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
08af9bf365
List before
2017-06-27 10:37:00 +02:00
Laurent Destailleur
34f3552dc7
Fix missing image of user
2017-06-27 04:31:29 +02:00
Laurent Destailleur
3fdfebf7ef
Fix position of top menu does not follow 'position' field.
2017-06-27 04:25:41 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae
Fixing pages warning when value is null
2017-06-24 16:45:45 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
996ec4926b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Laurent Destailleur
317ab64d7c
Fix escapement
2017-06-18 22:03:25 +02:00
Laurent Destailleur
f3a5975cf8
Fix sql injection
2017-06-18 21:58:56 +02:00
Laurent Destailleur
0ef507ae7f
Fix rename of file to remove .noexe extension.
2017-06-18 21:52:51 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
e813fd2dfa
Fix missing key import_key and extraparams
2017-06-16 12:57:30 +02:00
Laurent Destailleur
5a477bdd6d
Merge pull request #7018 from hregis/develop_bug_restapi
...
Fix: missing _cleanObjectDatas function
2017-06-16 12:53:11 +02:00
Laurent Destailleur
492ee135ba
Merge pull request #7011 from hregis/develop_bug3
...
Fix: error when the project module not enabled
2017-06-16 12:51:28 +02:00
Regis Houssin
c2901ae8cd
Fix: add/remove unset unsused fields
2017-06-16 11:01:58 +02:00
Regis Houssin
c656856ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-06-16 10:52:43 +02:00
Laurent Destailleur
07b676792a
Fix do not show localtax info if not used.
2017-06-16 01:02:53 +02:00
Regis Houssin
9410466d72
Fix: better check and security
2017-06-15 21:51:31 +02:00
Regis Houssin
78d5520741
Fix: missing _cleanObjectDatas function
2017-06-15 21:23:35 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Regis Houssin
8eb3f3bc06
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug3
2017-06-14 12:13:23 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Regis Houssin
50aa40da3b
Fix: error when the project module not enabled
2017-06-14 07:40:11 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
florian HENRY
71afaaa360
fix : availibity refresh
2017-06-12 17:24:36 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
6ab47a845e
Fix look and feel v6
2017-06-10 13:54:43 +02:00
Laurent Destailleur
a8e16910c0
Fix look and feel v6
2017-06-10 13:44:20 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
phf
0f80ee757f
Fix can not update extrafields values
2017-06-09 16:37:05 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
phf
d6d451b54a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-06-08 12:03:59 +02:00
phf
711f9696aa
New multi contacts on actioncomm
2017-06-08 12:02:39 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
phf
31aa8bdf05
Fix week view link has wrong link
2017-06-01 16:26:32 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
David
d8c5ec2aef
FIX: REST API not possible to add agendaevents
2017-05-29 13:47:42 +02:00
Laurent Destailleur
dc246fa44c
Merge pull request #6887 from hregis/develop_new
...
New: add REST api "dictionaryevents" for use with "agendaevents"
2017-05-29 10:16:35 +02:00
Laurent Destailleur
de1db57a9d
Merge pull request #6883 from dvasseur/develop
...
FIX: REST API not possible to add agendaevents
2017-05-29 10:12:33 +02:00
Regis Houssin
ee2019ae37
Fix: limit to 100 by default to avoid freeze
2017-05-26 16:52:27 +02:00
David
3898cfe02f
FIX: REST API not possible to add agendaevents
2017-05-23 18:27:41 +02:00
Laurent Destailleur
2da50f1eca
Look and feel v6
2017-05-23 01:32:19 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
807c77f754
Fix inconsistent options
2017-05-19 18:03:49 +02:00
Laurent Destailleur
bb2a9f9d0e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-19 17:24:31 +02:00
Laurent Destailleur
c30dcf78cb
Show info when link has been deleted
2017-05-19 17:24:15 +02:00
Laurent Destailleur
d1c4439a0f
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
...
NEW Module Agenda: Add option - Show linked object into agenda view
2017-05-19 17:23:54 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
ef575166c0
FIX #6651
2017-05-18 19:10:05 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
KHELIFA
169859b708
Module Agenda: Add option - Show linked object into agenda view
2017-05-17 17:00:45 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
553f5b990c
Fix scrutinizer errors
2017-05-13 18:50:55 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b81de35703
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
Laurent Destailleur
5581e5da72
FIX New vat code not correctly implemented if "1 price per customer".
2017-05-12 13:12:17 +02:00
Laurent Destailleur
2199c525bc
Merge pull request #6805 from grandoc/new_branch_06_05
...
Update code using new css class
2017-05-10 22:51:31 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
philippe grand
55feea5d98
Update code using new css class
2017-05-06 10:54:28 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
d7e10085b8
Clean code. Using 2 different key for a param is not more allowed.
2017-05-05 18:42:11 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
0bffac6dc4
Use constant vor status.
2017-05-05 13:43:43 +02:00
Laurent Destailleur
8f5fa1d810
Merge pull request #6769 from atm-ph/fix_propal_without_fetch_lines
...
Fix Propal class doesn't have fetch_lines method yet
2017-05-05 10:01:42 +02:00
Laurent Dinclaux
a1e9246794
Resolved merge conflict [2]
2017-05-05 10:34:38 +11:00
Laurent Dinclaux
24a2fb57ea
Resolved merge conflict
2017-05-05 10:22:46 +11:00
Laurent Destailleur
0c76db7973
FIX #6698 #6742
2017-05-04 13:41:37 +02:00
Laurent Destailleur
8318ebc109
Fix missing field into addline of proposals
2017-05-04 10:45:20 +02:00
David
270c3db32e
fix params order for tha addline() function
...
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
2017-05-04 10:16:36 +02:00
Laurent Destailleur
322cca8032
Merge pull request #6731 from dvasseur/develop
...
FIX: fix params order for the addline() function
2017-05-04 09:55:33 +02:00
Laurent Dinclaux
f63f28c7fe
Fix vat_src_code propagation between post types
2017-05-03 21:37:30 +11:00
Laurent Dinclaux
98b2e83bfb
Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786
2017-05-03 21:36:56 +11:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
phf
88515c306f
Fix Propal class doesn't have fetch_lines method yet
2017-04-28 14:33:06 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
0080821dc5
Fix no invoice if not a customer
2017-04-23 16:05:54 +02:00
Philippe Grand
c18e7e8816
Merge branch 'develop' into testing
2017-04-19 11:27:36 +02:00
Philippe Grand
529ae1fa92
Update propal.class.php
2017-04-19 10:01:43 +02:00
David
8bb7f858d9
fix params order for tha addline() function
...
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
2017-04-18 16:47:06 +02:00
Laurent Destailleur
3da0aea168
Prepare code to use different SMTP servers.
2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
philippe grand
06c91cdaf2
ref column was missing for specimen and some update
2017-04-11 14:47:11 +02:00
Laurent Destailleur
6aa56ce0fa
NEW Add a tracking id into mass emailing
...
Prepare code to use a dedicated SMTP server according to context.
2017-04-11 10:57:17 +02:00
Laurent Destailleur
9b45776941
Fix responsive
2017-04-10 17:25:53 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Widee
89716a86a5
Avoid (DEPOSIT) (1) & (2) descriptions
...
When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.
2017-04-04 12:22:51 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
e221c48997
Css
2017-04-01 00:59:21 +02:00
Laurent Destailleur
7254b54a04
Work on 6.0 look and feel
2017-04-01 00:49:06 +02:00
Laurent Destailleur
93687997c9
Work on 6.0 look and feel
2017-03-31 18:40:53 +02:00
Laurent Destailleur
7056edf509
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-31 18:32:36 +02:00
Laurent Destailleur
6e0918dded
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-31 18:31:54 +02:00
Laurent Destailleur
911d5832c6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-31 18:30:41 +02:00
Laurent Destailleur
b44143d24d
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-03-31 18:29:15 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
da1427ef54
Work on 6.0 look and feel
2017-03-30 16:10:08 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
Laurent Destailleur
f843f8a93d
Start to move search bar before table titles
2017-03-27 00:48:50 +02:00
BENKE Charlie
f4a7217f20
display total line for all total line
2017-03-26 01:49:48 +01:00
Laurent Destailleur
106d19a8af
FIX #6468 + Fix missing translation
2017-03-25 03:53:11 +01:00
Laurent Destailleur
aa9d991923
Fix css
2017-03-25 01:03:02 +01:00
BENKE Charlie
94a1fc19fa
display total line for all total line
2017-03-24 23:39:25 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
888675016d
NEW Can use dol_fiche_end without showing bottom border.
2017-03-15 11:13:30 +01:00
Laurent Destailleur
7f8c4d7d0f
Fix CSS
2017-03-14 14:33:25 +01:00
hugome
38ccf7ffdd
Fix : Agenda getCalendarEvents hook
...
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
2017-03-13 11:35:49 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
47dd53abbe
NEW The substitution keys available for emailing edition is now into a
...
popup
2017-03-11 02:36:22 +01:00
Laurent Destailleur
30c2ac37d5
Fix missing separator
2017-03-11 02:35:01 +01:00
Laurent Destailleur
618c27d63c
Optimize space
2017-03-10 16:26:43 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
4804cc47bd
Clean and uniformize code
2017-02-24 15:16:53 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
e981e719a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/comm/action/card.php
2017-02-23 02:54:40 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
jfefe
0a9ffa58c1
FIX : event status is not modified when assign an user
2017-02-20 09:54:20 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
Laurent Destailleur
7f21c3f3f2
Fix css email topic
2017-02-17 13:16:29 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
37caae3466
Merge pull request #6427 from laudeco/fix/calendar_move_error
...
allow the drag and drop of an event only for allowed users
2017-02-17 10:46:15 +01:00
Laurent Destailleur
498473715e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 01:48:43 +01:00
Laurent Destailleur
4c310964a9
Fix list of supplier proposals
2017-02-17 01:41:33 +01:00
De Coninck Laurent
979a5e70bf
allow the drag and drop of an event only for allowed users
...
The drag and drop of the event didn't take into account the user rights.
2017-02-16 07:51:46 +01:00
fmarcet
c175dfe68b
Fix: Bad code makes don't work for external modules numeration model
2017-02-15 09:47:18 +01:00
fmarcet
e903bf2b5c
Fix: Bad code makes don't work for external modules numeration model
2017-02-14 18:55:39 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
a4f2325902
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:28:49 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
fmarcet
d5978a5092
Fix: Wrong vat calculation when split discounts
2017-02-07 14:02:27 +01:00
Laurent Destailleur
ce067f9130
Merge branch 'new_link_weather_board' of
...
https://github.com/atm-geoffrey/dolibarr into
atm-geoffrey-new_link_weather_board
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/index.php
2017-02-06 20:51:46 +01:00
Marcos García de La Fuente
2dfced366e
NEW #2763 Go to document block after clicking in Generate document button
...
Close #2763
2017-02-03 20:11:06 +01:00
Laurent Destailleur
bda915c63a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-03 15:34:59 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
40737eac2e
FIX #6361
2017-02-02 02:49:04 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
45263c85ec
Fix in emailing
2017-01-29 20:33:08 +01:00
Laurent Destailleur
ff8b7e6e4d
Fix size of email
2017-01-29 18:35:56 +01:00
Laurent Destailleur
92e61e6707
Fix hide url if not defined
2017-01-29 18:29:37 +01:00
Laurent Destailleur
756919de2a
Fix deadlock feature: could not solve a situation where an emailing was
...
validated by error.
2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb
Fix css and missing translation key
2017-01-29 15:07:18 +01:00
Laurent Destailleur
c48400331f
Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date
...
NEW get multicurrency rate from document date (propal, order)
2017-01-27 01:32:52 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
9a59fbada7
Fix missing info admin picto. Fix colspan.
2017-01-23 17:31:39 +01:00
Laurent Destailleur
7622d3b2fb
Fix missing info admin picto. Fix colspan.
2017-01-23 10:23:24 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Juanjo Menent
2374aa351e
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-20 15:55:51 +01:00
Laurent Destailleur
5b8ff63981
Fix bad value
2017-01-20 14:17:58 +01:00
Laurent Destailleur
6780b20968
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43
Minor fixes
2017-01-20 14:10:57 +01:00
Laurent Destailleur
94249b7926
NEW Add statistics on tabs
2017-01-20 14:03:07 +01:00
Laurent Destailleur
b4733e043c
Fix tooltip when customer is closed
2017-01-20 12:17:10 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e
Fix position of field and tooltip
2017-01-20 12:08:33 +01:00
Marcos García de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Juanjo Menent
6cc3ef0c99
NEW: Events notifications in browser
2017-01-13 16:08:49 +01:00
Laurent Destailleur
31818e8816
Fix missing translation
2017-01-13 15:32:20 +01:00
Laurent Destailleur
27c056d377
Avoid duplicate function error
2017-01-03 11:30:27 +01:00
Laurent Destailleur
b642a3a602
Prepare release 5.0
2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
82052450a6
Complete work on dol_banner
2016-12-26 18:21:18 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
e297b64722
Several security fix in using mailings.
2016-12-26 12:35:10 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
b777ec79f2
Fix contextpage implementation into skeleton
2016-12-23 10:38:27 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
aspangaro
6caa3408ed
Remove field Skype. Already present in dol_banner_tab.
2016-12-22 06:23:43 +01:00
Laurent Destailleur
e50bbb05fa
Fix security bugs
2016-12-18 13:04:24 +01:00
Laurent Destailleur
9d3bd9d36f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-12-18 11:57:04 +01:00
Laurent Destailleur
12e919b99d
Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin
...
Fix user right write margin
2016-12-18 10:53:34 +01:00
Laurent Destailleur
394e284a4a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
htdocs/langs/en_US/errors.lang
2016-12-18 02:16:40 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Laurent Destailleur
73e6663230
Fix help/messages for emailing to warn users.
2016-12-17 14:47:06 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/conf/conf.php.example
htdocs/langs/en_US/mails.lang
2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282
FIX Security to restrict email sending was not efficient
2016-12-16 13:46:39 +01:00
phf
cca7967144
Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin
2016-12-15 16:19:54 +01:00
phf
21a648a052
Fix user right on margin module to write buyprice
2016-12-15 12:01:46 +01:00
phf
f5bffeb535
New get multicurrency rate from document date (propal, order)
2016-12-11 16:30:01 +01:00
Laurent Destailleur
6c4f15df63
Fix lot of fix in css look to match v5 rules.
2016-12-11 16:11:42 +01:00
Maxime Kohlhaas
177ec97689
Actualize currency on propal, order and invoice
2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
d426ab04f0
Multicurrency on proposal and order
2016-12-11 00:42:52 +01:00
florian HENRY
0e72e8492e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2016-12-10 12:22:07 +01:00
florian HENRY
9e8991f7fa
FIX : Bug when updateing availability and demand reason because $user
...
is not passed to trigger.
2016-12-10 12:21:48 +01:00
florian HENRY
654fbc5dc7
fix travis
2016-12-10 11:36:43 +01:00
florian HENRY
a0e8b509db
Finish Advance target emailing feature (back from hashes since 3.7)
2016-12-09 19:06:59 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
Laurent Destailleur
d23604701c
Fix responsive
2016-12-07 15:00:20 +01:00
Laurent Destailleur
1583d0e49f
Fix linkof mass action for pdf merge
2016-12-07 14:14:03 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
0ff21f0bee
Fix example
2016-12-05 12:04:22 +01:00
Laurent Destailleur
2b8fbf200a
Complete work on the new dol_banner
2016-12-03 21:29:49 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
arnaud
c17d354367
Fix propal updateline oldcopy extrafields
2016-11-30 16:48:27 +01:00
Laurent Destailleur
6624630cd1
Merge pull request #6052 from atm-alexis/FIX_bad_date_for_warning_check
...
FIX date for warning test might be the same as in propal list
2016-11-29 23:20:44 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
Alexis Algoud
950a63f121
FIX date for warning test might be the same as in propal list
2016-11-28 15:53:31 +01:00
Laurent Destailleur
e59edca855
Fix Responsive design
2016-11-27 20:55:59 +01:00
Laurent Destailleur
e52e17eec2
Fix Responsive design
2016-11-27 20:11:39 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
a8c3ce4e55
FIX A form should not be inside a table. Create javascript troubles.
2016-11-26 12:21:50 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
792e12e6c5
FIX : interface
2016-11-25 11:09:15 +01:00
gauthier
480b08bd0b
NEW : convert exceiss received to reduc
2016-11-24 15:48:04 +01:00
Laurent Destailleur
2043c279b0
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:47:40 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
b73a164256
Work on accounting module
2016-11-17 16:32:19 +01:00
gauthier
8e7c0fa353
FIX : wrong var name
2016-11-17 14:21:19 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +01:00
Laurent Destailleur
e4617ec76c
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/filemanagerdol/connectors/php/config.php
htdocs/viewimage.php
2016-11-11 15:03:05 +01:00
Laurent Destailleur
da387db166
NEW Error code of each email sent is visible in list of email targets
2016-11-11 14:03:57 +01:00
Laurent Destailleur
2cfcca82b4
Fix list of linked object block
2016-11-11 02:18:48 +01:00
Laurent Destailleur
e4c4ced5a3
Complete work on usin dol_banner
2016-11-11 01:55:53 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Marcos García de La Fuente
c6f96a81d1
Little correction
2016-11-09 11:30:55 +01:00
Marcos García de La Fuente
0b594eab59
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
2016-11-09 11:28:05 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
fcca3d6be1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-11-08 17:21:41 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
Laurent Destailleur
bf7916e310
Merge pull request #5959 from defrance/patch-39
...
bad tx_tva if PRODUIT_CUSTOMER_PRICES enabled...
2016-11-08 14:34:06 +01:00
Laurent Destailleur
9bff6f966b
NEW Can add event from the card listing events
2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994
NEW Better filtering of automatic/manually inserted events.
2016-11-08 13:03:20 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
Laurent Destailleur
4681c84e1d
Better responsive
2016-11-06 12:16:10 +01:00
BENKE Charlie
31acffbb13
error on get tva_tx on product customer price
2016-11-05 10:58:55 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
59291be6e0
NEW Can filter on status on objects on the "statistics" page.
2016-11-03 19:50:04 +01:00
Laurent Destailleur
a658b7cc3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/card.php
2016-10-31 21:31:57 +01:00
Laurent Destailleur
090f13afa4
Fix missing id param
2016-10-30 22:10:00 +01:00
Laurent Destailleur
90b138a504
Fix position of table
2016-10-30 20:30:00 +01:00
Laurent Destailleur
3fbba59f69
Better management of status of events
2016-10-30 13:12:35 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
f1ec2c04ed
Uniformize code
2016-10-28 18:40:26 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
223047cdf5
Uniformize look and feel on stock movement
2016-10-28 16:05:33 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Laurent Destailleur
77a9eb4950
Merge pull request #5927 from IonAgorria/propal-relative
...
NEW: Proposal line move when cloning with different delivery date
2016-10-26 11:36:50 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
f1421a2ee4
Rename constant with english name
2016-10-24 13:10:35 +02:00
Laurent Destailleur
0ae5a3799c
Fix html
2016-10-24 12:42:37 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27:39 +02:00
Laurent Destailleur
33a7b7037d
Save information of vat code into database
2016-10-24 03:23:40 +02:00
Laurent Destailleur
dada679110
Uniformise code
2016-10-18 12:16:12 +02:00
Ion Agorria
1b49a735b2
NEW: Proposal line move when cloning with different delivery date
2016-10-17 23:27:27 +02:00
Laurent Destailleur
434b3ef643
Uniformize code and look and feel
2016-10-17 17:52:58 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Laurent Destailleur
cd9654978b
NEW Filters can accept generic search key like __DAY__, __MONTH__,
...
__YEAR__ replaced with current day, month year before making the search.
2016-10-09 19:49:09 +02:00
florian HENRY
38fa0bed4b
FIX delete line with no triggers
2016-10-07 15:30:35 +02:00
Laurent Destailleur
6ac39b97e4
Fix restore list of attached files into action report
2016-10-03 00:38:28 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
6f26a7390e
FIX #5752 Bug VAT NPR not propagated during proposal cloning
2016-10-01 18:33:37 +02:00
Laurent Destailleur
03c60f1b7d
FIX #5802 Incoterms not set
2016-10-01 13:55:07 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
aspangaro
922495d72d
Correct travis & typo "Execuete"
2016-09-24 07:18:38 +02:00
Laurent Destailleur
35dd492d19
NEW Add REST api for commercial proposals
2016-09-22 12:53:44 +02:00
Laurent Destailleur
4ec7bcd23e
Rename api class to solve conflict
2016-09-22 11:36:16 +02:00
Laurent Destailleur
ead3990171
Better size of filter
2016-09-19 17:40:40 +02:00
Laurent Destailleur
c4c7ccc226
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/societe/note.php
htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
af28a67803
Uniformize look using dol_banner
2016-09-19 10:43:30 +02:00
Laurent Destailleur
77e2037195
NEW Add REST API to read, create and delete agenda events
2016-09-19 02:02:45 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
d1c4f02bf7
Uniformize code and style
2016-09-18 14:41:17 +02:00
Laurent Destailleur
a4c3a4588d
FIX link "back to list" was not visible.
2016-09-18 14:12:49 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
49e54d55d5
Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not
...
usable.
2016-09-10 18:19:54 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Laurent Destailleur
6d6eceb0ca
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:38 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
f440e78fa6
FIX quick search boxes when nojs or when using smartphone
2016-09-03 12:56:49 +02:00
Laurent Destailleur
b107b0644f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:07:17 +02:00
Laurent Destailleur
ba76f12a28
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/product/price.php
htdocs/product/stock/class/mouvementstock.class.php
2016-09-02 19:24:28 +02:00
Laurent Destailleur
70de814c3c
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-09-02 19:03:31 +02:00
Laurent Destailleur
8fd082cf16
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
gauthier
18cf2f8f8b
FIX : header title in commercial area
2016-08-31 10:19:40 +02:00
Laurent Destailleur
2e7e5151b7
Merge pull request #5463 from hregis/develop_origin
...
New: Add entity field in llx_societe_remise_except and llx_societe_remise
2016-08-28 12:23:04 +02:00
Laurent Destailleur
898a93b25d
Merge pull request #5656 from defrance/patch-24
...
New: Add color of type for url background
2016-08-28 12:10:33 +02:00
BENKE Charlie
f6a7838c80
Update actioncomm.class.php
...
the variable name defined on the class is type_color
2016-08-28 07:59:47 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
BENKE Charlie
223eed0cba
Update index.php
2016-08-25 12:24:38 +02:00
BENKE Charlie
89e6b5a6cd
add color of type for URL background
2016-08-25 12:22:17 +02:00
Regis Houssin
6e40f9e700
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/core/class/html.form.class.php
Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
2016-08-25 10:15:26 +02:00
Laurent Destailleur
8f809e403d
Uniformize code
2016-08-24 19:38:34 +02:00
Laurent Destailleur
87c49366d8
Uniformize code
2016-08-23 15:43:48 +02:00
Juanjo Menent
3b509db141
Merge pull request #5604 from atm-florian/FIX_createpropalfromproject
...
FIX : create proposal from project
2016-08-11 20:43:44 +02:00
florian HENRY
d38ff5c246
FIX : create proposal from project
2016-08-10 11:34:10 +02:00
florian HENRY
5bb3b5c074
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
2016-08-10 09:47:25 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
Juanjo Menent
48fe3524d5
Fix #5582 Can't add or change customer ref on proposal
2016-08-04 17:34:53 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
20a2282efc
Updated screenshots
2016-07-31 16:24:32 +02:00
Laurent Destailleur
857de64607
Fix multicurrency
2016-07-30 16:41:10 +02:00
Laurent Destailleur
834c10a1f4
Fix css
2016-07-29 11:06:03 +02:00
Laurent Destailleur
00118610bb
A fix to make editinplace working better
2016-07-28 15:29:46 +02:00
Laurent Destailleur
f54946bacb
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
2016-07-28 10:10:58 +02:00
Regis Houssin
6bf655c882
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/societe/class/societe.class.php
Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
2016-07-28 09:53:10 +02:00
Laurent Destailleur
0334b58a4b
Hide feature not yet validated to be ready for a stable 4.0
2016-07-27 20:24:30 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
aspangaro
2e4bebbaf9
FIX Presentation correction
2016-07-27 07:24:36 +02:00
Regis Houssin
4b8f42949c
# WARNING: head commit changed in the meantime
...
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
058c431483
FIX The project was lost when creating the event "sent by email". Also,
...
event company "create" was not tracked by default like others.
2016-07-21 13:49:10 +02:00
Laurent Destailleur
774e327831
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
abfa86d628
Merge pull request #5476 from defrance/patch-11
...
NEW Display label and location of event on tooltip
2016-07-20 18:20:27 +02:00
Laurent Destailleur
01c140ecac
FIX External user must not be able to edit its discounts
2016-07-20 02:16:10 +02:00
BENKE Charlie
093f1da206
Some indenting and hookmanager feature
2016-07-18 15:07:35 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d
Fix better error message when possible refering objects list is empty.
2016-07-16 14:37:35 +02:00
Laurent Destailleur
f758f3466e
Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card
...
NEW : select default bank account on thirdparty card
2016-07-15 11:16:17 +02:00
Laurent Destailleur
dd7c7b9d4b
Merge pull request #5467 from atm-florian/add_update_trigger
...
NEW : review Propal/Order/Invoice class to be uniformize on triggers calls
2016-07-14 23:00:11 +02:00
BENKE Charlie
427a8c5bf4
Display label and location of event on tooltip
...
Think some additionnal info must be show on society too
2016-07-12 09:56:43 +02:00
florian HENRY
10b0e5dd57
clean trigger and normalize code
2016-07-08 21:28:21 +02:00
florian HENRY
195d6187a3
NEW : Uniformize code and correct deal with triggers
2016-07-08 20:40:25 +02:00
philippe grand
bc5b9bd8a2
internationalization of code comment
2016-07-08 18:24:55 +02:00
Juanjo Menent
043ff934fb
Merge pull request #5459 from atm-florian/fix_syntax
...
fix syntax 'year' instead of '$year'
2016-07-07 17:22:15 +02:00
Regis Houssin
961a37d724
Merge remote-tracking branch 'origin/develop' into develop_origin
2016-07-07 12:45:03 +02:00
Regis Houssin
08725003b9
Fix: add entity field in llx_societe_remise, useful when third-sharing
...
is used with multicompany
2016-07-07 12:43:02 +02:00
Regis Houssin
ee02ff43d7
Fix: add entity field in llx_societe_remise_except, useful when
...
third-sharing is used with multicompany
2016-07-07 12:26:30 +02:00
Laurent Destailleur
3566c3fd6e
Fix bad link
2016-07-07 11:31:07 +02:00
florian HENRY
1957af52b1
fix syntax
2016-07-07 09:23:43 +02:00
Laurent Destailleur
d22ef4f371
Fix Do not show status
2016-07-06 22:35:12 +02:00
Laurent Destailleur
b12bd9b070
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-01 03:51:59 +02:00
Laurent Destailleur
f8b1d0d7ca
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-01 03:51:23 +02:00
Laurent Destailleur
15e79cf089
Merge pull request #5411 from atm-alexis/FIX_develop_compatibility
...
FIX old method add have to return create method result
2016-07-01 03:44:18 +02:00
Laurent Destailleur
5713d293e3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-01 03:22:16 +02:00
Laurent Destailleur
6066b711af
Merge pull request #5427 from atm-geoffrey/FIX_project_select_on_event
...
Fix #4828
2016-07-01 02:47:43 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
florian HENRY
37ee64ae9b
fix 4672
2016-06-30 17:10:06 +02:00
florian HENRY
388bd5ca48
code review
2016-06-30 16:42:49 +02:00
atm-geoffrey
75bb161930
FIX #4828
2016-06-30 16:20:53 +02:00
Alexis Algoud
a55a166df3
FIX old method add have to return create method result for backward compatibility
2016-06-29 16:30:47 +02:00
Frédéric FRANCE
76a113257e
Update index.php
2016-06-29 16:16:56 +02:00
Laurent Destailleur
1e9cee1b07
Fix bug reported by scrutinizer
2016-06-29 11:48:28 +02:00
Alexis Algoud
7e8506e25f
FIX #5338 use of not initialized var $aphour, $apmin, etc
2016-06-28 13:25:47 +02:00
Laurent Destailleur
b529a53501
Fix var not initialized
2016-06-28 02:36:40 +02:00
Laurent Destailleur
1368e6d462
Fix: error message was not enough to understand
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b
Fix: error message was not enough to understand
2016-06-24 17:04:59 +02:00
Laurent Destailleur
2767df2e01
FIX Solve problem of sending joinded files of another email when several
...
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
eac5cbb0dd
FIX Fix the reposition on the clear target button.
2016-06-19 11:59:55 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
c7065cc3b8
Minor esthetic fixes
2016-06-07 13:15:38 +02:00
Laurent Destailleur
645412517d
css enhancement
2016-06-06 22:07:35 +02:00
Laurent Destailleur
559c1aa010
Fix alignetment of title in some arrays
2016-06-06 16:37:18 +02:00
Laurent Destailleur
473ab18306
Fix link on workboard
...
Fix warning picto is missing on task list
2016-06-06 15:48:41 +02:00
Laurent Destailleur
0e06f116a2
Fix truncation of event conente in agenda view
2016-06-06 15:13:55 +02:00
Laurent Destailleur
9b6e5196ea
Debug module resource. Filter on agenda.
2016-06-06 13:05:36 +02:00
Laurent Destailleur
9eee61e6b7
Fix trans
2016-06-06 11:13:19 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
bd2fe75d08
Fix menus in dashboard links
2016-06-04 14:45:03 +02:00
Laurent Destailleur
bfb7923d4c
Merge pull request #5268 from atm-ph/fix_multicurrency_conf
...
Fix conf useful has been commented
2016-06-04 11:37:01 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
phf
495ce2463d
Fix switch currency on document do not get the associate rate
2016-06-04 01:13:23 +02:00
Laurent Destailleur
9c3365aefc
FIX #5163
2016-06-04 00:52:55 +02:00
Laurent Destailleur
149c6916f8
FIX ##5263
2016-06-03 22:20:58 +02:00
gauthier
ab06ffda58
NEW : select default bank account on thirdparty card
2016-06-03 15:43:05 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
geoffrey.girard
d9a1be48cf
ADD : new link on weather board for proposals late
...
this link sort on datep asc
2016-06-01 11:19:10 +02:00
Laurent Destailleur
460d7ce915
FIX Split of credit note into discount page generates records not
...
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
ed148f70b3
FIX Filter on assigned to was preselected on current user on list "All
...
events" (instead of no filtering)
2016-05-30 18:12:27 +02:00
Laurent Destailleur
46a0f3dab0
Fix minor bugs
2016-05-30 01:30:28 +02:00
Laurent Destailleur
e7072185ab
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal.php
2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Regis Houssin
c7dda59fbc
Fix: doublon (merge problem?)
2016-05-18 17:33:51 +02:00
Laurent Destailleur
3b99fb01ee
Fix duplicate table
2016-05-17 10:51:03 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
55e904bc01
Debug for expert accounting module
2016-05-12 20:45:05 +02:00
Laurent Destailleur
c8d98dbfdc
FIX error reported by scrutinizer
2016-05-08 11:33:46 +02:00
Laurent Destailleur
eaa548124b
Merge remote-tracking branch 'origin/3.9' into develop
2016-05-08 11:03:51 +02:00
Laurent Destailleur
cb4e569a5f
FIX Merge manually PR #5161 - Bad translation key
2016-05-08 10:48:55 +02:00
Laurent Destailleur
0a5863d879
Merge pull request #5177 from simnandez/develop
...
Fix: Remove unused variables
2016-05-07 20:16:01 +02:00
Juanjo Menent
ae6e233781
Merge pull request #5176 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2016-05-07 00:49:57 +02:00
Juanjo Menent
f73c8310fb
Merge remote-tracking branch 'upstream/develop' into develop
2016-05-06 22:13:03 +02:00
Juanjo Menent
47103fdac7
Fix Remove unused variables
2016-05-06 22:11:05 +02:00
Laurent Destailleur
d484383467
Minor errors
2016-05-06 22:06:23 +02:00
Laurent Destailleur
bf09e4a0b9
PHPdoc
2016-05-06 21:28:06 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-05-06 19:10:59 +00:00
Laurent Destailleur
91d300289f
Minor fix in presentation
2016-05-06 12:15:44 +02:00
Laurent Destailleur
a05963ee2b
Better position for clear button
2016-05-06 11:22:58 +02:00
Laurent Destailleur
5a75f346ff
Debug advanced selector
2016-05-06 00:02:22 +02:00
Laurent Destailleur
cdbbe8d87b
Minor fixes
2016-05-05 23:44:44 +02:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
8bc0ef3afe
Merge pull request #5166 from frederic34/patch-9
...
put colspan in td instead tr
2016-05-05 22:56:17 +02:00
Laurent Destailleur
f901453a6b
FIX addMoreActionsButtons hook must be inside the div class=tabaction.
2016-05-05 21:38:29 +02:00
Frédéric FRANCE
72695d1dee
put colspan in td instead tr
2016-05-04 17:02:58 +02:00
Florian HENRY
3d57e83094
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Laurent Destailleur
4758c82d41
Solve minor translation
2016-04-26 09:45:19 +02:00
Laurent Destailleur
9d21b63562
Beautify a page
2016-04-23 16:55:08 +02:00
Laurent Destailleur
00a658143d
NEW List of user in agenda view per user show photo thumb
2016-04-23 16:51:22 +02:00
Laurent Destailleur
b639849a47
Page for proposals must be called card.php (one of last architecture
...
change before the freeze)
2016-04-23 15:37:22 +02:00
Laurent Destailleur
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +02:00
Laurent Destailleur
78d18185e4
Several css enhancements
2016-04-22 11:11:08 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
3ba87be4ef
Merge pull request #5029 from marcosgdf/deprecated-functions
...
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-21 01:18:22 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
21ba24a0cd
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-16 22:13:55 +02:00
Marcos García de La Fuente
84b58d27e6
NEW Renamed ActionComm::add function to ActionComm::create
2016-04-16 21:41:06 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Laurent Destailleur
dd1f946afe
Clean dead code
2016-04-09 19:06:40 +02:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
c2fc9ecf68
Fix scrutinizer warning
2016-04-09 16:12:53 +02:00
Laurent Destailleur
60682f075c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-08 21:46:17 +02:00
Laurent Destailleur
010a4f8929
Merge pull request #4945 from frederic34/shipcust
...
NEW : Select Preferred Sending Method for a third party
2016-04-08 21:31:06 +02:00
Laurent Destailleur
92f1092f5c
Fix remove warnings
2016-04-08 19:46:56 +02:00
Laurent Destailleur
7a48ceb635
Uniformize code for mass actions
2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0
NEW Can select fields to show on list also for list of customer orders,
...
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0
Work on select fields for orders, invoices and shipments
2016-04-08 01:00:02 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
frederic34
e53501f89d
add lang
2016-04-04 18:37:04 +02:00
frederic34
198b9ce8fe
Select Preferred Sending Method for a customer
2016-04-04 18:28:55 +02:00
Florian HENRY
b7a0ab784b
travis
2016-04-04 16:59:17 +02:00
Florian HENRY
c0c37c4992
travis
2016-04-04 16:36:39 +02:00
Laurent Destailleur
76ad7f36b9
FIX Filter/search on extrafields on lists
2016-04-04 16:03:35 +02:00
Florian HENRY
86c34a313e
travis
2016-04-04 15:28:25 +02:00
Laurent Destailleur
5101c96223
Restore button to create object from the project view.
2016-04-04 15:25:08 +02:00
Laurent Destailleur
cea48a8dd6
FIX bad translation language loaded
...
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Florian HENRY
038b928ea4
fix travis
2016-04-01 17:09:03 +02:00
Laurent Destailleur
97b5026ad8
Uniformize code and css
2016-04-01 16:18:45 +02:00
Florian HENRY
ae51321040
Debug Advance target emailing
2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
Laurent Destailleur
9459a36c12
Minor look enhancement
2016-03-31 12:28:45 +02:00
Laurent Destailleur
54f3005666
NEW Can select fields to show on proposal lists.
2016-03-31 11:58:05 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
334cdbc2f5
NEW Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list
2016-03-30 11:13:29 +02:00
Laurent Destailleur
0d9a86db3f
Minor lool enhancement
2016-03-30 00:06:55 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
ba4f5c8648
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34
Fix regression description line not visible
2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:15:23 +01:00
Laurent Destailleur
f0eb8ac794
Fix regression Product ref not visible
2016-03-19 19:13:27 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
1ded08abef
FIX When using option Price per level, when adding a predefined product,
...
the vat for customer was not correctly set.
2016-03-15 21:02:45 +01:00
Laurent Destailleur
0f65251615
Missing class fielddeliverydelay
2016-03-15 19:38:01 +01:00
Laurent Destailleur
dae41e6dd3
FIX Only active users are visible into agenda view "per user"
2016-03-15 00:54:45 +01:00
Laurent Destailleur
08c5fd2e36
FIX #4809 - Duplicate functions with different content
2016-03-14 14:38:30 +01:00
Laurent Destailleur
619ebf9a3e
Enhance css of search fields
2016-03-13 20:38:16 +01:00
Laurent Destailleur
5ce7e70097
Clean css
2016-03-13 14:39:41 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Laurent Destailleur
74f9ed029c
Code comment
2016-03-05 01:37:05 +01:00
Laurent Destailleur
6e8b176d8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-04 16:24:03 +01:00
Laurent Destailleur
36474eabec
NEW Add stats and late records into dashboard for supplier proposals.
2016-03-04 16:14:23 +01:00
Laurent Destailleur
c63ee8ceb5
Debug module supplier proposal
2016-03-04 16:08:51 +01:00
Ion Agorria
a1159b6f29
Fix: unset date start/end at success
2016-03-04 14:11:06 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Laurent Destailleur
2eaa21ea5c
Fix minor css error (pixel size must have "px"). Compatibility with old
...
behaviour.
2016-02-29 10:50:52 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
93b1b4c66e
FIX #4580
2016-02-21 21:02:25 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
Ion Agorria
fc8f1272d2
Fix line fetch not converting dates
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
2016-02-20 02:34:01 +01:00
Ion Agorria
6002897976
Fix line fetch not converting dates
2016-02-19 20:06:09 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
b70f2f329c
Fix bad position of form
2016-02-19 03:59:22 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
Laurent Destailleur
f809800e01
Fix sql error
2016-02-16 15:36:54 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
c85b7932a9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/class/commonobject.class.php
2016-02-15 01:18:59 +01:00
Laurent Destailleur
04b390f21c
Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE
...
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee
Doc comment
2016-02-14 21:58:54 +01:00
aspangaro
45cc841b92
Correct travis
2016-02-13 08:10:13 +01:00
Laurent Destailleur
94732b8ae9
NEW When emailing is not sent completely, show progression
2016-02-12 14:23:40 +01:00
Laurent Destailleur
d0ab1db19b
NEW When emailing is not sent completely, show progression
2016-02-12 14:21:44 +01:00
Laurent Destailleur
2796875ed1
Can select size of list of targets of email
2016-02-12 13:58:24 +01:00
Laurent Destailleur
158906455a
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:40:33 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Laurent Destailleur
0d7f67ade5
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-10 23:59:15 +01:00
Laurent Destailleur
e169cd3364
Fix usage of filter into selection of email members into emailing.
2016-02-10 23:48:18 +01:00
Laurent Destailleur
6dbaba6973
Fix: previous and next arrow
2016-02-10 17:45:26 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Regis Houssin
0b25601307
Fix: wrong object name
2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf
Fix: missing signature and uniformize code between card and script
2016-02-08 12:20:40 +01:00
Laurent Destailleur
c4c7ea2f22
FIX Relative discount decimals are not saved
2016-02-08 02:49:19 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-30 15:59:40 +01:00
Christophe Battarel
1baf25de3c
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden
...
constant
2016-01-27 12:04:00 +01:00
phf
83f90e2b1f
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/commande/card.php
2016-01-25 21:50:43 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
274caf61eb
NEW Add statistics for interventions module
2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b
NEW Module "Supplier commercial proposal" (price request) is set to
...
stable status.
2016-01-25 12:33:38 +01:00
phf
373225272b
FIX reorder the display of currency and rate on propal/order
...
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
2016-01-23 16:01:55 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
phf
e86ebd6799
NEW add multicurency on customer order
2016-01-23 00:38:17 +01:00
phf
21db62d645
FIX multicurrency price always display and update line price if rate is
...
update
2016-01-22 22:35:32 +01:00
Regis Houssin
2b7b7e014d
Fix: for avoid conflict with "global $m" in memory.lib.php
2016-01-22 13:20:21 +01:00
Laurent Destailleur
f2f4c60dbd
Merge pull request #4469 from aspangaro/3.9-p8
...
Fix: Commercial index presentation - missing $var=!$var when we have no data
2016-01-22 04:15:22 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
phf
148a5947a7
FIX update propal line the multicurrency price do not change
2016-01-21 22:40:07 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
aspangaro
192c58f10d
Fix: Commercial index presentation - missing $var=!$var when we have no data
2016-01-21 05:44:53 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
7f4386f739
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-15 01:53:21 +01:00
Laurent Destailleur
cb24f2b372
Fix missing type in list
2016-01-15 01:52:16 +01:00
Laurent Destailleur
a0fc26fbd8
Fix missing orde by
2016-01-14 17:09:59 +01:00
Laurent Destailleur
524614ded9
Start to work on a per type view of agenda
2016-01-14 16:52:46 +01:00
Laurent Destailleur
b5f057051b
Fix: Missing param into link
2016-01-14 15:45:05 +01:00
Laurent Destailleur
acf3f23de8
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-14 14:15:44 +01:00
Laurent Destailleur
b8b84c67a6
Fix bad setting of default actioncode
2016-01-14 14:15:14 +01:00
phf
9b682e095f
FIX can't clone event
2016-01-13 14:41:32 +01:00
Laurent Destailleur
7fd2cbea49
Merge pull request #4257 from defrance/patch-91
...
add icalname on default event
2016-01-12 23:41:57 +01:00
Laurent Destailleur
0a255decf8
Merge pull request #4401 from aspangaro/develop-p2
...
New: #3292 Make sure each and every page displays a title
2016-01-12 23:19:17 +01:00
aspangaro
cf6be40922
New: #3292 Make sure each and every page displays a title
2016-01-11 22:03:26 +01:00
aspangaro
3ff9fe3123
Fix: Add missing key language for propal
2016-01-09 08:26:08 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
cbe65fbc79
Fix: fields added into 3.8 to store email event was not enough. To late
...
to use them. Will be done into 4.0
2016-01-08 13:05:56 +01:00
Laurent Destailleur
4e2d4a6651
Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.
...
Solved this by completing tooltip info.
2016-01-07 11:01:37 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Marcos García de La Fuente
d30c64413d
FIX #4055 SQL error when trying to access a non-existing expedition
2015-12-24 14:27:12 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
a2ae9b9cfc
Fix forget password page must have a different title then login page
...
Fix Missing translations
2015-12-21 00:47:44 +01:00
Laurent Destailleur
d7e9c92144
Fix bad link on category
...
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
BENKE Charlie
efb1e91a23
Update index.php
...
i have add an icalcolor test for icalevent too and made some reindentation
2015-12-19 10:29:56 +01:00
BENKE Charlie
dc0af179e9
add icalname on default event
...
allow to manipulate it (show/hide) when we add some other calendar on main (eg fichinter calendar)
2015-12-18 01:41:30 +01:00
Laurent Destailleur
34f4e913d4
Merge pull request #4240 from frederic34/patch-9
...
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
2015-12-16 19:58:48 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
f87ccc97e2
Miscellaneous fixes
2015-12-16 19:26:50 +01:00
Frédéric FRANCE
9e6698c6ca
Update multiprix.php
2015-12-16 18:18:02 +01:00
Laurent Destailleur
0ec62c05cc
Fix bad var name. Removed warning.
2015-12-14 09:14:34 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
philippe grand
30eb08151d
[Qual] Close database handler should be after Footer
2015-12-11 14:19:38 +01:00
Ion Agorria
1dc5854535
Fix date handling for hours/mins in some pages
2015-12-07 03:59:03 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
e002021d7d
Fix td balance
2015-12-05 17:49:08 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +01:00
Florian HENRY
955fad910d
FIX : Bug: $this is not accessible in static context in
...
Mailing::libStatutDest #4050
2015-12-04 17:32:17 +01:00
Florian HENRY
ee08c4afc4
Display the ref_supplier inside the contract list of /comm/card.php
...
#4090
2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81
Cannot change the date of a contract #4088
2015-12-03 10:58:06 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
5df193ec93
Uniformize code
2015-11-28 20:25:50 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
a94aedb171
Minor css fix
2015-11-22 12:33:56 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
e31a8f25a2
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 10:55:23 +01:00
Marcos García de La Fuente
2dedea8736
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-20 22:03:44 +01:00
phf
c21354101f
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 15:36:02 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
ea6fe02f18
Merge pull request #3923 from altatof/customerinfos
...
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
8925717bbe
Merge pull request #3966 from atm-ph/fix_38_title_actioncomm
...
FIX mail isn't display in title on event in mode view
2015-11-12 15:07:29 +01:00
Laurent Destailleur
9a9be97c2c
Add a log to help diagnose bad usage of method ad of event
2015-11-12 14:36:35 +01:00
phf
f041c017e9
FIX mail isn't display in title on event in mode view
2015-11-12 11:30:44 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
Christophe Battarel
cc35f2b738
Merge branch 'develop' into customerinfos
2015-11-11 15:46:22 +01:00
Christophe Battarel
0c40a6dda5
add hidden constant
2015-11-11 15:32:42 +01:00
philippe grand
d06a445e01
[Qual] Uniformize code
2015-11-10 19:22:27 +01:00
Alexis Algoud
99513ac9f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-09 18:31:21 +01:00
Alexis Algoud
68cbd4699b
NEW multi event type for filter and get form in order to allow bookmark
2015-11-09 17:18:23 +01:00
philippe grand
b34edeb751
[Qual] Uniformize code
2015-11-07 21:56:21 +01:00
Christophe Battarel
f52ae35dc6
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
...
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
philippe grand
5f74a0f1c0
Traduction
2015-11-06 09:46:18 +01:00
philippe grand
67c9db6a51
[Qual] Uniformize code
2015-11-06 09:36:16 +01:00
Sergio Sanchis Climent
6bf8b7f328
Default value origin_id and origin
2015-11-06 02:25:51 +01:00
Sergio Sanchis Climent
6b01db5960
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee
Maintain origin_id and origin for copy document
...
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
fmarcet
015dedc3ab
FIX: Show category selector if we have permission to view products or
...
services
2015-11-05 11:53:45 +01:00
Alexis Algoud
e1ea2215a3
FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch
2015-11-05 11:25:04 +01:00
Alexis Algoud
0543a31920
FIX event's data lost on user assign update
2015-11-05 11:11:03 +01:00
Laurent Destailleur
fa413fea76
FIX #3813
2015-11-05 03:12:57 +01:00
Laurent Destailleur
f319976e5d
FIX #3878 Storing and deleting files on emailing was done at wrong place
...
Conflicts:
htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00
Laurent Destailleur
a612289136
FIX Storing and deleting files on emailing was done at wrong place
2015-11-05 03:02:31 +01:00
Raphaël Doursenaud
23a5c303dd
Fix #3870 Missing translation
2015-11-04 19:56:12 +01:00
Laurent Destailleur
a7795f25fc
Fix Must make a difference between a buying/cost price == '' (not
...
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
1ee9594e38
Merge pull request #3846 from frederic34/patch-21
...
Correction double translation which give bad html display
2015-11-02 11:29:04 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
philippe grand
ff5fcbbc10
[Qual] Uniformize code
2015-10-31 17:21:48 +01:00
Frédéric FRANCE
08dccf341c
Update list.php
2015-10-31 11:24:49 +01:00
Laurent Destailleur
2c682022cf
NEW The search box and the bookmarks are now rendered by the menu
...
manager.
2015-10-30 09:36:57 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Alexis Algoud
fa3af485ef
FIX action not appear before an update
...
because of a lack of line in action ressource
2015-10-26 18:33:22 +01:00
Laurent Destailleur
132bc610b6
Icon for contact contains a part of thirdparty icon to make things
...
easier to understand
2015-10-25 23:32:49 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
5181afd49d
Disable dead code
2015-10-24 19:29:41 +02:00
Laurent Destailleur
8d24adc97e
Remove 2 other duplicated pages. There is only one page now for all list
...
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
2015-10-23 13:52:51 +02:00
Laurent Destailleur
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +02:00
Frédéric FRANCE
73f13045c1
Update index.php
2015-10-20 18:24:14 +02:00
Frédéric FRANCE
2989a94458
Update index.php
2015-10-20 18:19:32 +02:00
Frédéric FRANCE
4062e7474d
Update index.php
2015-10-20 18:05:21 +02:00
Frédéric FRANCE
d9a56ef418
Update index.php
2015-10-20 17:00:34 +02:00
Maxime Kohlhaas
4de7874118
New : review customer account summary and balance
2015-10-19 20:36:25 +02:00
Maxime Kohlhaas
55657690bf
Remove unused var
2015-10-19 19:07:02 +02:00
Maxime Kohlhaas
a953a66616
New : allow to define list size for object list on customer card
2015-10-19 19:05:04 +02:00
Laurent Destailleur
7d382f7997
FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES
...
into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED
for better compatibility with old versions
2015-10-19 18:17:19 +02:00
Laurent Destailleur
81580f75b9
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Laurent Destailleur
420bfd8301
FIX Preview pages was not using correct style for ref
2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39
FIX The preview of PDF was never refreshed if PDF document was changed
2015-10-18 18:54:54 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
Laurent Destailleur
fc8f4b4d6e
Merge pull request #3745 from atm-arnaud/3.8_fix_propale_facturee
...
FIX bug invoice classified in propale next update commonobject class …
2015-10-17 10:38:35 +02:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
2122d4d43a
NEW Contract module can be used to follow both sold and bought
...
contracts/recurring subscriptions.
2015-10-17 00:52:35 +02:00
Laurent Destailleur
537a13e2f4
NEW Show which fields are used for search when doing a generic search
...
from the quick search form.
2015-10-17 00:14:36 +02:00
Laurent Destailleur
dc5cc52395
NEW Merge all search fields of an area page into one search box
2015-10-16 10:52:49 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
2015-10-16 09:52:38 +02:00
arnaud
6bd13b8071
FIX bug invoice classified in propale next update commonobject class in 3.8
2015-10-15 17:02:33 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
a5b9a210ce
Merge pull request #3725 from FHenry/3.8
...
FIX : #3724 Bug: Blank page after cloning proposal with changed client
2015-10-14 21:27:58 +02:00
Laurent Destailleur
e9facbf108
FIX bad property so after creating an event from calendar, filter were
...
lost.
2015-10-14 10:53:38 +02:00
Florian HENRY
727db56576
FIX : #3724 Bug: Blank page after cloning proposal with changed client
2015-10-14 08:27:56 +02:00
Laurent Destailleur
70f3da80df
FIX Option SOCIETE_DISABLE_PROSPECTS not supported into title of box
2015-10-13 14:21:00 +02:00
Laurent Destailleur
6520ed7a08
Use css not bold title.
...
Add missing badge (count of draft records) on draft list.
2015-10-13 14:09:14 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
Florian HENRY
8aaa1993c6
FIX : #3724 Bug: Blank page after cloning proposal with changed client
2015-10-13 09:37:33 +02:00
Marcos García de La Fuente
252f00dfe7
Merge branch '3.6' into clone-proposals
2015-10-11 12:29:45 +02:00
Laurent Destailleur
7b7d27920d
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
Laurent Destailleur
279e7028fb
Merge pull request #3686 from grandoc/3.7
...
3.7
2015-10-09 20:38:16 +02:00
Laurent Destailleur
c675f88dda
Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning
...
[Qual] Prevent warning
2015-10-09 20:29:24 +02:00
Laurent Destailleur
2937ad219a
Merge pull request #3682 from tysauron/develop
...
For not error Undefined property: stdClass::$id
2015-10-09 20:25:39 +02:00
Laurent Destailleur
a1d37f92cb
Several fix in CSS
2015-10-09 20:00:43 +02:00
Laurent Destailleur
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
philippe grand
6cce2860c2
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7
2015-10-08 09:12:36 +02:00
tysauron
ea949437ab
For not error Undefined property: stdClass::$id
2015-10-07 17:17:32 +02:00
Laurent Destailleur
8d47a307bb
Better use of space
2015-10-06 21:52:42 +02:00
Laurent Destailleur
1f742c7464
FIX Add a test to save life when ref of object (invoice ref, order ref,
...
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Raphaël Doursenaud
c208fccf35
[Qual] Prevent warning
...
calcul_price_total() prefers to have the seller and localtaxes specified
2015-10-06 15:03:59 +02:00
Laurent Destailleur
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +02:00
Raphaël Doursenaud
afbee44993
Fix #3667 checkbox extrafields on edit
...
For actions and members.
2015-10-05 20:51:43 +02:00
philippe grand
78cb31e55f
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7
2015-10-05 14:50:30 +02:00
Laurent Destailleur
68d4a9fc63
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-10-04 20:46:17 +02:00
Laurent Destailleur
a65d10de90
Merge pull request #3654 from frederic34/patch-12
...
Update index.php
2015-10-04 20:10:54 +02:00
Laurent Destailleur
0df42bc5ea
FIX Filter on status of thirdparty list and bad encoding of url
2015-10-04 19:37:49 +02:00
frederic34
f2d7523091
Optioncss
2015-10-04 12:31:32 +02:00
frederic34
1108458de8
Optioncss
2015-10-04 11:45:02 +02:00
frederic34
9a021e6de4
Optioncss not kept in list
2015-10-04 10:45:57 +02:00
Juanjo Menent
31230d296d
Merge remote-tracking branch 'upstream/3.8' into develop
2015-10-03 23:51:38 +02:00
Frédéric FRANCE
ebe937f8b7
Update index.php
2015-10-03 21:32:43 +02:00
Laurent Destailleur
00911d1afe
Fix bad param
2015-10-03 19:05:13 +02:00
Laurent Destailleur
474bf611ad
FIX product type must be defined before used for vat calculation.
2015-10-03 18:33:46 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
philippe grand
e22fb3c538
fix : Typo
2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5
fix : Typo
2015-10-02 12:37:13 +02:00
Laurent Destailleur
17a5b0a0f4
Fix css
2015-10-02 11:58:19 +02:00
Florian HENRY
fd29bb34be
FIX : Mass Mailing activity don't display all status
2015-10-01 16:09:04 +02:00
Laurent Destailleur
b57c156b60
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modContrat.class.php
htdocs/fichinter/card.php
htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/security.lib.php
2015-10-01 11:10:47 +02:00
Laurent Destailleur
4da8fb901b
Add comment
2015-10-01 10:48:09 +02:00
Laurent Destailleur
60c6510fc1
NEW Can set default value of event type when creating an event (if type
...
of event option is used).
2015-09-29 14:17:03 +02:00
Florian HENRY
766b8535ae
spacing
2015-09-29 09:47:23 +02:00
Florian HENRY
4f5e207f08
review
2015-09-29 09:45:04 +02:00
Florian HENRY
0f27edad5d
FIX : When delete actioncomm also delete actioncomm_resources
2015-09-28 10:14:19 +02:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
dd88a799fb
FIX Event from ical stream should not be movable into calendar view
2015-09-26 13:54:50 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
d503dd928b
Merge pull request #3597 from GPCsolutions/displaymargin
...
[Qual] Replaced deprecated displayMarginInfos()
2015-09-26 08:47:55 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
50edf63448
[Qual] Replaced deprecated displayMarginInfos()
2015-09-24 21:05:58 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
a70e73a963
FIX Missing validate button if permission are not valid.
2015-09-23 01:08:23 +02:00
Laurent Destailleur
f81df66564
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
Laurent Destailleur
00b858e644
Merge pull request #3564 from FHenry/3.8
...
FIX : remove twice same test
2015-09-23 00:07:28 +02:00
Laurent Destailleur
077c696c09
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/.gitignore
htdocs/theme/.gitignore
2015-09-22 16:28:34 +02:00
Laurent Destailleur
da6a1d6629
NEW Introduce a method getDefaultCreateValueForField for developers to
...
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Florian HENRY
178208918f
FIX : remove twice same test
2015-09-22 12:03:11 +02:00
Marcos García de La Fuente
e80f29c271
Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed page
2015-09-16 12:47:13 +02:00
Florian HENRY
a0fb27bd80
FIX : Can create Proposal on close thridparty #3526
2015-09-15 14:34:49 +02:00
Laurent Destailleur
a5c6582bc1
Fix duplicate translation/encoding on setEventMessage
...
Conflicts:
htdocs/ftp/index.php
2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1
Fix duplicate translation/encoding on setEventMessage
2015-09-12 12:52:07 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Florian HENRY
a49f88c259
reveiw thirdparty list and add column and filter on country and typeent
2015-09-10 11:55:05 +02:00
Florian HENRY
6cb993c0b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-10 11:20:03 +02:00
Laurent Destailleur
615734012e
Merge pull request #3476 from marcosgdf/refactor
...
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +02:00
Marcos García de La Fuente
3c8d02b865
Removed unused variable
2015-09-06 20:49:11 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
f1ea19e09b
Created ActionComm:hasDelay function
2015-09-06 18:26:48 +02:00
Laurent Destailleur
0d811dce6a
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:21:42 +02:00
Laurent Destailleur
5d34f787a3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/conf.class.php
2015-09-03 10:51:17 +02:00
Laurent Destailleur
cda681ac6a
Merge pull request #3451 from atm-gauthier/3.8_fix_right_on_asksupplierprice
...
FIX : on asksupplierprice module, order creation button must be avail…
2015-09-03 10:36:30 +02:00
Laurent Destailleur
563c434fcf
Fix injection
2015-09-03 09:56:33 +02:00
Gauthier
c2c394ed8d
FIX : on asksupplierprice module, order creation button must be available if user is allowed to create supplier order and not if he's allowed to create customer order
2015-09-02 11:07:30 +02:00
Laurent Destailleur
5fd6c44640
Fix error management
2015-08-31 13:00:24 +02:00
Laurent Destailleur
6624182361
Fix form outside table
2015-08-28 00:29:46 +02:00
Laurent Destailleur
a54589c13c
Fix filter lost
2015-08-24 17:47:26 +02:00
Laurent Destailleur
2cf10ac05d
Fix filtering
2015-08-24 16:32:43 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
1a55159e35
Fix filter on prospect status
2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9
Fix the property "list" was not used.
2015-08-24 14:42:07 +02:00
philippe grand
d51912687b
the form should be outside table to avoid errors
2015-08-15 15:37:54 +02:00
philippe grand
a2b39721ce
the form should be outside table to avoid errors
2015-08-15 15:35:31 +02:00
philippe grand
39c2c6b61b
the form should be outside table to avoid errors
2015-08-15 15:30:12 +02:00
philippe grand
d596f5222b
the form should be outside table to avoid errors
2015-08-15 15:08:11 +02:00
Laurent Destailleur
10d3c41358
Fix Bad value into popup
2015-08-14 20:07:11 +02:00
Laurent Destailleur
1731b1a11b
Fix: transparency of event was lost
2015-08-14 13:01:20 +02:00
Laurent Destailleur
d19f1722a2
Fix: when there is several events on agenda view per user, we must
...
include ref into label to have different titles.
2015-08-14 12:31:09 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
4b51fc80a6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2015-08-13 00:06:27 +02:00
Laurent Destailleur
b5730a24bc
Fix W3C
2015-08-12 22:28:30 +02:00
Marcos García de La Fuente
7cb564586e
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
...
Close #3310
2015-08-09 13:52:02 +02:00
Maxime Kohlhaas
0afd27e3c2
New : % of evolution on stats
2015-08-07 13:29:11 +02:00
Marcos García de La Fuente
a1f74763da
Merge branch '3.5' into bug-3206
...
Conflicts:
ChangeLog
2015-08-03 18:55:01 +02:00
Juanjo Menent
05b0a9b675
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Laurent Destailleur
6adc3ba604
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2015-07-30 14:54:33 +02:00
Laurent Destailleur
ff8969073c
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/main.inc.php
2015-07-28 18:57:13 +02:00
Laurent Destailleur
747e4b5e40
Fix timezone problem with external calendar import.
2015-07-28 18:12:45 +02:00
Gauthier
aaa9d85d07
FIX : When we add an user on event in create mode, we lose linked object
2015-07-28 17:25:33 +02:00
Laurent Destailleur
5ca6593a57
Fix serious deadlock feature. It was possible to link with no way to
...
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
268674899e
Fix: css on current day
2015-07-21 12:30:12 +02:00
Laurent Destailleur
977d2d3463
Fix: The hook addCalendarChoice was only visible into tabs index.php
2015-07-21 12:19:21 +02:00
Laurent Destailleur
9e35fd1bc3
Doc comments
2015-07-21 11:04:01 +02:00
Maxime Kohlhaas
646ad48bd0
Better fix for not numeric qty or discount
2015-07-21 10:50:07 +02:00
Laurent Destailleur
38d30b5590
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2015-07-21 00:17:11 +02:00
Laurent Destailleur
2bebb869fb
Fix bad signature of fetch. The ref_ext is missing.
2015-07-20 17:19:44 +02:00
Marcos García de La Fuente
4649cf7210
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
...
Close #3206
2015-07-18 19:40:48 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Maxime Kohlhaas
5223934ff0
Fix #3188 SQL error if qty or discount is not a number on proposal add line
2015-07-14 12:17:50 +02:00
Laurent Destailleur
581b6d0001
Fix: missing status on contacts
2015-07-14 11:51:27 +02:00
Laurent Destailleur
c28ff6c257
NEW Add status into filters of graph
2015-07-09 12:29:01 +02:00
Laurent Destailleur
251fedad48
NEW Can edit email template using WYSIWYG editor
2015-07-04 11:57:55 +02:00
Laurent Destailleur
56560d9379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:49:01 +02:00
Laurent Destailleur
5fafb08f91
Uniformize code
2015-07-04 04:11:16 +02:00
Laurent Destailleur
9c80735310
An easier to use dictionary page to edit email template.
...
Uniformize look.
2015-07-04 03:28:52 +02:00
Laurent Destailleur
312281f4d4
Debug askpricesupplier
...
Try to continue work on position of menu entries.
2015-07-02 22:43:51 +02:00
Laurent Destailleur
6ef0b8e330
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-01 21:17:05 +02:00
Laurent Destailleur
b766f99acc
Uniformize look.
...
Make code to manage link "Now" on calendar more generic.
2015-06-30 21:50:24 +02:00
Laurent Destailleur
57a267a30f
NEW Add hooks to allow an external module to complete list of events
...
into calendar views.
2015-06-30 17:09:52 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Regis Houssin
7ec13c9435
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
2015-06-26 16:56:41 +02:00
aspangaro
f9831f908e
Use print_liste_field_titre();
2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
bdba8f1f38
Fix courrent outstanding amount not visible
2015-06-23 23:33:25 +02:00
Laurent Destailleur
5a8e763099
Uniformize code for hooks
...
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
825369230f
Finishment of look
2015-06-20 23:33:13 +02:00
Laurent Destailleur
01fbee0e06
Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr
...
into aspangaro-develop-patch34
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2015-06-19 11:27:15 +02:00
Laurent Destailleur
44d4d23c00
Fix phpcs
2015-06-19 11:21:36 +02:00
aspangaro
0c01295016
Fix travis
2015-06-19 06:19:10 +02:00
Laurent Destailleur
8df56511be
NEW Enhance prototype, project list and proposal list with new hook to
...
have an external module able to add more fields.
2015-06-16 19:36:44 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6
Merge pull request #2412 from marcosgdf/commercial-name
...
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
Laurent Destailleur
d3549cc2a0
Merge branch 'add_clone_on_event_agenda' of
...
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-add_clone_on_event_agenda
Conflicts:
htdocs/langs/en_US/agenda.lang
2015-06-16 11:41:45 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Juanjo Menent
0596be1656
Merge pull request #3008 from hregis/develop_strict
...
Fix: ereg more simple
2015-06-12 21:24:13 +02:00
Raphaël Doursenaud
4e143755e8
Fix: missing categories class in customer/prospect card
...
Also check that the categories module is enabled and user has permissions to see categories
2015-06-12 15:56:39 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Raphaël Doursenaud
2629e47f77
Fix #3001 : the current code needs an array, not an object
2015-06-10 18:45:10 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
df1dfcbd8a
NEW Can filter proposal on a tag of a product
...
Enhance also the prototype test_arrays to include select form before
table.
2015-06-08 15:07:37 +02:00
Gauthier
dd81d3a762
NEW : add all assigned users and all extrafields data in new event when we createFromClone
2015-06-08 15:06:43 +02:00
Gauthier
053cfac262
NEW : clone action on agenda events
2015-06-08 12:39:25 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
51d275ee77
Merge pull request #2941 from atm-gauthier/3.7
...
FIX : When we clone a propal, if it has a project which is not assign…
2015-06-05 15:56:36 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Laurent Destailleur
4c7ccf6145
NEW Can filter on contact status in prospect list. Removed deprecated
...
menu entry.
2015-06-05 10:49:02 +02:00
Laurent Destailleur
bbd8a712cf
Merge pull request #2932 from GPCsolutions/dolibarr-2571
...
Added tags/categories management to customers
2015-06-05 09:44:06 +02:00
Laurent Destailleur
f7eaf35d30
NEW When creating order, proposal or invoice from thirdparty card, the
...
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
2015-06-03 11:55:39 +02:00
Gauthier
3f4ded4780
FIX : When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third.
2015-06-02 16:06:03 +02:00
phf
0523f226cf
FIX : when mailing is deleted, the targets list was kept in database
2015-06-01 12:29:10 +02:00
Raphaël Doursenaud
ea798c2315
Qual: deprecate dol_json_encode() and dol_json_decode()
...
PHP > 5.3 supports json_encode() and json_decode() natively
2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6
Work on finishing of style
2015-05-31 01:06:51 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Raphaël Doursenaud
bbd0b89087
Added tags/categories management to customers
...
Customers part of #2571
2015-05-29 18:50:43 +02:00
Gauthier
a707d40251
FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status
2015-05-29 14:32:50 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
dcc197eb6b
Fix bug debian 786479
2015-05-22 17:13:32 +02:00
Laurent Destailleur
995a2c127d
Working on finishing of look
2015-05-22 15:29:19 +02:00
Laurent Destailleur
390c7d8e65
Fix link to prospect with filter on commercial status
...
Enhance natural_search method to allow to search on several ids.
2015-05-22 15:19:27 +02:00
Laurent Destailleur
4319cd63a3
Working on finishing of look
2015-05-22 14:28:02 +02:00
aspangaro
e23459d53b
NEW Forms are using the tab look, even in creation mode
2015-05-20 21:50:38 +02:00
tysauron
572269bed1
For backward compatibility ON update actioncomm
...
For backward compatibility when val=id ON update actioncomm object
2015-05-19 15:54:08 +02:00
Laurent Destailleur
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Alexis Algoud
a4031a3680
if contact in sellist, it's an Id
2015-05-18 18:33:17 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7
Merge remote-tracking branch 'upstream/develop' into commercial-name
2015-05-15 11:17:21 +02:00
Alexis Algoud
3dc5ffa871
FIX send mail, copy sendto don't read the list of contact
2015-05-13 18:05:26 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
e149d49fb8
[Qual] Use jQuery property instead of attribute to test and set disabled
2015-05-12 14:53:01 +02:00
Laurent Destailleur
83e4fe5d95
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/fourn/facture/list.php
2015-05-12 00:09:03 +02:00
Laurent Destailleur
8b596d7a69
Fix css missing
2015-05-10 23:43:18 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
971e23e006
Fix special_code was lost when updating line
2015-05-07 12:10:27 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
Juanjo Menent
2707dcd283
Code fixes
2015-05-06 23:44:53 +02:00
Laurent Destailleur
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
Laurent Destailleur
e73526b29c
Fix prospect box must use the getNomUrl method
2015-05-04 12:42:45 +02:00
Laurent Destailleur
89c9996b22
Fix translation of status
2015-05-04 09:50:49 +02:00
Laurent Destailleur
53bf90a3e2
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2015-04-28 21:54:13 +02:00
Laurent Destailleur
b30ee6b3fa
Better fix for #2725
2015-04-28 21:12:04 +02:00
Laurent Destailleur
414404e854
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/class/commonobject.class.php
2015-04-26 16:30:33 +02:00
Laurent Destailleur
60a56da370
Some change into css. Tabs background are now white so main content is
...
black on white (better contrast).
Fix editfieldval for date.
2015-04-25 22:20:10 +02:00
Laurent Destailleur
13b4d86064
Better fix for #2709
2015-04-24 21:29:02 +02:00
Laurent Destailleur
d925e552ca
Merge pull request #2709 from atm-alexis/3.7
...
FIX event not linked to contact on creation
2015-04-24 21:23:50 +02:00
Alexis Algoud
7d3482036d
FIX event not linked to contact on creation
2015-04-24 17:40:53 +02:00
Gauthier
58008cef94
NEW : display linked object in edit mode when we create an event from an order, propal...
2015-04-23 16:28:29 +02:00
Laurent Destailleur
0e141f2c1b
Fix css
2015-04-23 15:35:32 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Laurent Destailleur
1c8e1638c7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-21 12:08:56 +02:00
Laurent Destailleur
5a9c40eb59
Fix minor look and security errors
2015-04-21 12:03:51 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
270bca740c
Merge branch 'develop' into units
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2015-04-19 00:59:04 +02:00
