lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

2486 Commits

Author SHA1 Message Date
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018 
clean and update code
 2018-06-24 13:47:26 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8 clean and update code 2018-06-22 16:27:11 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost 
when clculating total_ht_devise
 2018-06-13 16:35:52 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs 
loadlangs
 2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0 Fix space/tab 2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2 Get external contacts ids instead of BILLING contacts ids. 2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2018-05-28 09:30:21 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
 2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Neil Orley
15e02c7082 NEW : adds billing contacts ids to REST API returns 
adds billing contacts ids to REST API returns for proposals, orders and invoices
 2018-05-22 11:40:32 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element 
Add propals lines inport on invoices.
 2018-05-18 08:55:29 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
atm-john
6b2dfa0528 Extend lines import to propal 2018-05-10 21:06:18 +02:00
Ferran Marcet
70527e64c5 New: Add Date delivery and Availability on Propals List 2018-05-08 18:15:02 +02:00
atm-quentin
8cd6c72a2f NEW advanced rights 2018-05-07 10:04:43 +02:00
atm-quentin
ec5e84075e NEW Rights to ignore price min 2018-05-03 10:18:38 +02:00
atm-quentin
21b387a4c4 NEW thirdparty categ filter on lists 2018-05-02 15:01:32 +02:00
Laurent Destailleur
3374c50e2d CSS 2018-05-01 10:42:09 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +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
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
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +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
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
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
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
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
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
93f4d6fdcd Translation 2018-03-11 21:34:38 +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
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +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
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
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +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
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +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
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
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
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
b3df7670e9
Merge pull request #7999 from frederic34/propalweight 
NEW display weight volume in propal
 2018-02-03 16:58:58 +01:00
Laurent Destailleur
1f2d275ef2 Fix conditions of some fields 2018-01-13 17:21:56 +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
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
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +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
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
Laurent Destailleur
80bdb45be8 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:48:16 +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
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
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +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
Frédéric FRANCE
b58df17545
default currency on propal create 2017-11-02 18:14:55 +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
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
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
c6e5115d34 Set default limit to 100 on all rest api that list 2017-10-22 15:42:19 +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
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
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
45ac8367bd NEW Add API for contracts 2017-10-16 17:56:59 +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
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +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
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
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
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
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
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
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
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +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
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
71ce82b6b9 NEW Better autoselect customer or supplier fields to save clicks 2017-09-12 16:51:10 +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
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
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
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
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
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
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
60493d0a47 Several fixes (permission, missing method or class) in REST APIs 2017-07-28 11:03:30 +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
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
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
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +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
fappels
6effcb0829 New add trigger disable to updateline functions 2017-07-06 16:26:15 +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
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
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +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
Regis Houssin
cd095e99c9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +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
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +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
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +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
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
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +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
philippe grand
55feea5d98 Update code using new css class 2017-05-06 10:54:28 +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
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
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
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
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
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
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
93687997c9 Work on 6.0 look and feel 2017-03-31 18:40:53 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +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
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
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
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
19e60f03b9 Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms 2017-02-21 14:17:44 +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
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
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
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
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
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
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
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
b642a3a602 Prepare release 5.0 2016-12-31 16:35:56 +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
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +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
f5bffeb535 New get multicurrency rate from document date (propal, order) 2016-12-11 16:30:01 +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
9e8991f7fa FIX : Bug when updateing availability and demand reason because $user 
is not passed to trigger.
 2016-12-10 12:21:48 +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
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +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
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +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
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
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
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
BENKE Charlie
31acffbb13 error on get tva_tx on product customer price 2016-11-05 10:58:55 +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
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
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
Ion Agorria
1b49a735b2 NEW: Proposal line move when cloning with different delivery date 2016-10-17 23:27:27 +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
ead3990171 Better size of filter 2016-09-19 17:40:40 +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
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +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
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
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
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
857de64607 Fix multicurrency 2016-07-30 16:41:10 +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
Laurent Destailleur
0334b58a4b Hide feature not yet validated to be ready for a stable 4.0 2016-07-27 20:24:30 +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
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
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
Laurent Destailleur
3566c3fd6e Fix bad link 2016-07-07 11:31:07 +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
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
559c1aa010 Fix alignetment of title in some arrays 2016-06-06 16:37:18 +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
phf
495ce2463d Fix switch currency on document do not get the associate rate 2016-06-04 01:13:23 +02:00
Laurent Destailleur
149c6916f8 FIX ##5263 2016-06-03 22:20:58 +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
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Juanjo Menent
47103fdac7 Fix Remove unused variables 2016-05-06 22:11:05 +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
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
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
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
76ad7f36b9 FIX Filter/search on extrafields on lists 2016-04-04 16:03:35 +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
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
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
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
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
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +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
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
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
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
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +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
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
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
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
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
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
f87ccc97e2 Miscellaneous fixes 2015-12-16 19:26:50 +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
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
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
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
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
philippe grand
b34edeb751 [Qual] Uniformize code 2015-11-07 21:56:21 +01:00
Sergio Sanchis Climent
6bf8b7f328 Default value origin_id and origin 2015-11-06 02:25:51 +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
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or 
services
 2015-11-05 11:53:45 +01:00
Laurent Destailleur
fa413fea76 FIX #3813 2015-11-05 03:12:57 +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
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
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
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
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
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
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
Florian HENRY
727db56576 FIX : #3724 Bug: Blank page after cloning proposal with changed client 2015-10-14 08:27:56 +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
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
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
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +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
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
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +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
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
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
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
philippe grand
a2b39721ce the form should be outside table to avoid errors 2015-08-15 15:35:31 +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
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
Maxime Kohlhaas
646ad48bd0 Better fix for not numeric qty or discount 2015-07-21 10:50:07 +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
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
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
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +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
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
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
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
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
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
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +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
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
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +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
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
c228302039 minor fix 2015-04-13 13:14:13 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Marcos García de La Fuente
6fe803cd86 Created Propal, FactureFourniseur, and Commande constants for status 2015-04-03 05:18:47 +02:00
Frédéric FRANCE
46af2caba1 Correction warning delay workboard propal 2015-03-31 18:51:24 +02:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Maxime Kohlhaas
154e1a7991 Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d Fix : display proposal date on proposal list 2015-03-10 14:56:58 +01:00
Laurent Destailleur
9e4e9a5411 NEW: Can search on customer order amount into customer order list. 2015-03-06 20:59:18 +01:00
Laurent Destailleur
ec4c1a493f Merge pull request #2424 from FHenry/develop 
NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export
 2015-03-04 23:14:05 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Marcos García de La Fuente
b69ce21e3e Removed duplicated code 2015-03-04 10:37:45 +01:00
Florian HENRY
ae8ca9e96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-03 17:55:57 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
8e26c71fa7 Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 04:59:27 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
Laurent Destailleur
fe7889e266 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Laurent Destailleur
386eaf0911 Fix: bad sql request 2015-02-26 12:11:31 +01:00
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
Florian HENRY
99153915dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-19 10:09:38 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
e7d95f553b Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-18 23:43:22 +01:00
Marcos García de La Fuente
fa55c60c35 Renamed WorkBoardResponse to WorkboardResponse 2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911 Renamed BoardResponse to WorkBoardResponse 2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44 Missing Copyright info 2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9 Refactored dashboard indicator 2015-02-15 15:01:28 +01:00
phf
36304234d2 [CORE] ajout de l'incoterm sur les pages propal et à l'objet (#incoterm). 2015-02-10 11:46:35 +01:00
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Florian HENRY
5f68acfdd8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-07 20:32:54 +01:00
Christophe Battarel
3940abe7c1 FIX: select DISTINCT for natural search on proposal list (in the same 
way it's done in invoices list)
 2015-02-07 10:48:03 +01:00
Florian HENRY
1eb73d0e49 fetch optional extrafeild lines on propal fetch 2015-01-31 13:52:23 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
frederic34
12c8d4ba1f Merge remote branch 'upstream/develop' into tooltip 2015-01-22 00:44:50 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Frédéric FRANCE
229f7888ca Update index.php 2015-01-19 20:38:33 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
bd7f6339ce Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-25 12:08:35 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Frédéric FRANCE
dd2b19d855 Typo 2014-12-09 22:45:27 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
Laurent Destailleur
86a3a4f618 Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680 
Conflicts:
	htdocs/comm/propal/list.php
 2014-11-22 15:57:06 +01:00
Laurent Destailleur
6c7bab8d8c Merge pull request #2045 from frederic34/patch-4 
#1682 Date is missing in proposals list
 2014-11-22 15:50:50 +01:00
Laurent Destailleur
86f2f191ea Merge pull request #2046 from frederic34/patch-5 
#1683 Can't clear sort filter on proposals list
 2014-11-22 15:50:37 +01:00
Laurent Destailleur
f7206c2a52 Fixed: [ bug #1578 ] Cannot create proposal by copy of another one 2014-11-19 23:10:30 +01:00
Frédéric FRANCE
5536abecf7 #1683 Can't clear sort filter on proposals list 2014-11-17 23:57:01 +01:00
Frédéric FRANCE
f2eda0629b #1682 Date is missing in proposals list 2014-11-17 23:54:39 +01:00
aspangaro
de7a38417f #1680 Clear sort filter works partially in prospects list 2014-11-17 21:45:29 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined. 
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
 2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
f3d7da8feb Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 20:25:36 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
aspangaro
df5d34266c Lost button 2014-11-02 15:26:20 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
7988532e4e Fix: Bad closing tab on preview pages. 2014-10-17 12:56:54 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
d518278166 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture/class/facture.class.php
 2014-10-03 19:17:28 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Christophe Battarel
2c52de3840 fix missing "," 2014-09-24 12:12:10 +02:00
Christophe Battarel
d1868b643e FIX: clone line extrafields value on quote, order and invoice 2014-09-24 11:47:34 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Marcos García de La Fuente
3561c8e6f3 Removed deprecated usage of propale_pdf_create 2014-09-16 20:57:17 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
5e75dd27e8 Merge pull request #1719 from frederic34/selectbank 
Select bank account for propal order and invoice
 2014-07-11 12:29:21 +02:00
frederic34
f29eeceb1a Select bank account for propal and order 2014-07-06 20:49:34 +02:00
KreizIT
fc6382ea7e Fix: [ bug #1463, #1464 ] Proposal triggers problem 2014-07-04 15:15:36 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Juanjo Menent
811ac6701a [ task #1063 ] Allow edit localtaxes rate for thirds. Works with propals 2014-07-04 11:02:41 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
79dec7ad90 Merge pull request #1641 from defrance69/patch-17 
Patch 17
 2014-06-26 21:43:45 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
2edfcc2583 Fix: ref was not set on object after renamed 2014-06-12 15:56:38 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
BENKE Charles
d0bab2f7e2 Update propal.class.php 
research additionnal models numbering in additional modules folders
 2014-06-06 12:29:20 +02:00
Laurent Destailleur
14d76d9229 Merge pull request #1632 from nicolasb827/patch-1 
Patch, missing product_type (or reset) on propal update line
 2014-05-30 11:31:36 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
nicolasb827
c3ebece1ef fix update SQL request 2014-05-28 01:25:36 +02:00
nicolasb827
83aba41c6c copy type on line update 2014-05-28 01:18:31 +02:00
nicolasb827
c091009afb fetch product_type field from DB 
When loading propal line on edit, product_type is reset to 0
 2014-05-28 01:07:27 +02:00
Laurent Destailleur
33ef8595dc Fix: Bad alignement 2014-05-27 10:19:34 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
693529c40b Merge pull request #1549 from atm-maxime/develop 
Fix : proposal validation was converting third as customer
 2014-04-23 21:18:34 +02:00
Maxime Kohlhaas
d21ea0fe19 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-04-23 17:51:22 +02:00
Maxime Kohlhaas
b9865b9ccc Fix : proposal validation was converting third as customer 2014-04-23 17:50:47 +02:00
BENKE Charles
ad9efb3961 Update propal.class.php 
it's this->lines who used on create propal function not this->products
 2014-04-21 15:40:08 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
BENKE Charles
f1d9cebb93 Update propal.class.php 
refactoring LibStatut function (small is better)
 2014-03-31 02:38:07 +02:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca Qual: Uniformize search date for lists. 2014-03-06 17:02:27 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
7db903e671 Fix: special code was lost during update 2014-03-01 16:58:10 +01:00
Laurent Destailleur
634c5b64f1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/product/fiche.php
 2014-02-12 00:25:08 +01:00
Laurent Destailleur
4869b95601 Fix: Default size too long making screen hang. 2014-02-12 00:01:22 +01:00
Laurent Destailleur
213a64edcc Fix for missing param. 2014-02-10 01:36:15 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal 
clone of propal improvements
 2014-01-24 01:33:15 -08:00
Christophe Battarel
81bae5fff9 fix wrong constant usage 2014-01-21 18:33:25 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
699a079ed7 New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and 
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
 2014-01-20 00:31:32 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Christophe Battarel
7d04944ca7 don't reset ref_client if same customer and MAIN_KEEP_REF_CUSTOMER_ON_CLONING 2014-01-16 11:48:48 +01:00
Christophe Battarel
687fc1798b on clone of propal, copy contact informations 2014-01-16 11:43:59 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
simnandez
a1e0d84e37 Fix: Lost stats filters into year selection 2013-12-19 15:43:22 +01:00
simnandez
8e247e8615 Trad: Fix missing translation 2013-12-19 12:47:39 +01:00
Laurent Destailleur
ca36a4dd97 Merge pull request #1348 from atm-alexis/3.5 
Improper use of delete() function and ldap with multientity bug corrections
 2013-12-16 05:26:31 -08:00
Laurent Destailleur
bba2892752 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/commande/liste.php
 2013-12-15 02:02:24 +01:00
Laurent Destailleur
db9ef992eb Fix: Clean var 2013-12-14 17:25:57 +01:00
Laurent Destailleur
42f032ded3 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 01:30:15 +01:00
Laurent Destailleur
88aa0ad4da Fix: Doxygen problems 2013-12-14 01:28:59 +01:00
Alexis Algoud
895f5452b4 In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted. 
Ex in agefodd module:
	$obj_link=new Propal($db);
        $obj_link->id=$agf->propalid;
        $resultdel=$obj_link->delete($user);

To prevent misuse of the function, the reference is not considered given
 2013-12-11 15:14:29 +01:00
Laurent Destailleur
d39ed05c5d Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/propal/list.php
 2013-12-01 16:05:09 +01:00
Florian Henry
b9d37fd6f7 [ bug #1159 ] Commercial search "other" give p.note do not exists 2013-11-28 14:28:03 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Raphaël Doursenaud
9be462e43c Text is not a type, let's use string 2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
e514b50d7e Typo fix 2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type 
Timestamps are integers so let's document this correctly
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
8907c9944d Assigments in conditions is often considered bad practice 
So let's put a comment, just in case
 2013-11-07 20:51:30 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
braito4
e89c3fa074 Update list.php 
sql error.
 2013-10-30 11:51:23 +01:00
Florian Henry
bdcbd4ee42 Fix list propal and invoice to display customer ref if option is set 2013-10-22 12:47:26 +02:00
Laurent Destailleur
ef86f150be Fix: duplicate field 2013-10-08 12:25:41 +02:00
Laurent Destailleur
47a9837046 Uniformize ref_customer into list 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
 2013-10-07 21:58:12 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
949b8c6274 Mark method classer_facturee deprecated. 
Make better translation of some workflow options.
 2013-09-16 11:50:53 +02:00
Laurent Destailleur
6ad569a511 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-13 16:21:02 +02:00
Laurent Destailleur
82f4d588fc Fix: Can't search on proposals 2013-09-13 16:17:19 +02:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
simnandez
002e248f00 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:55:49 +02:00
simnandez
817569d487 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:54:47 +02:00
simnandez
b36dc08e00 Remove unnecessary code 2013-09-12 09:59:23 +02:00
simnandez
699414cab7 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:45:16 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
657c4d6e90 Fix: Fix graph for product distribution. 
Add limit and add entry other.
 2013-08-27 11:54:07 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
Laurent Destailleur
7a8d28f135 Several fix for last pull request: 
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
 2013-08-06 19:12:26 +02:00
lalaina rasamoelina
2e25d17372 T960-develop : Put the note_private in the propal list 
In the propal list, if there are the private notes,we print them and we can edit them
htdocs/comm/propal/list.php
 2013-08-06 16:41:36 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Laurent Destailleur
9c88c03860 Fix: missing css class on tr 2013-07-25 13:56:07 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
83b5c193f7 Fix: move search_ville into search_town (search_ville no more used into 
3.5).
 2013-07-19 14:00:08 +02:00
Laurent Destailleur
2814aeec1d Merge pull request #1109 from PaulPoulain/930-develop 
Put the town in the list of propal
 2013-07-19 04:53:51 -07:00
Laurent Destailleur
d5ca2f9f40 Fix: forged select for stats where wrong when filtering on a thirdparty 
Conflicts:
	htdocs/compta/facture/class/facturestats.class.php
 2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26 Fix: forged select for stats where wrong when filtering on a thirdparty 2013-07-18 15:25:25 +02:00
lalaina rasamoelina
29094c9623 Put the town in the list of propal 2013-07-18 09:20:18 +02:00
Florian Henry
d09af2b18e Better use of reopen method 2013-07-15 09:37:55 +02:00
Florian Henry
9d0fe3c1da Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN 2013-07-15 09:33:26 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was 
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
 2013-07-10 17:29:54 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
bcc9b81bab Merge pull request #1052 from PaulPoulain/943 
T943: Put the total of the price at the bottom of the propal list
 2013-06-19 09:29:29 -07:00
lalaina rasamoelina
e8f26ad33b T943 If there is only one page, we keep label "Total HT", but if there is more than one page, we use "Total HT for this page" 2013-06-18 10:59:19 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
377f308d08 Merge pull request #1049 from PaulPoulain/935 
T935 put a filter on the author in the propal list
 2013-06-15 15:17:58 -07:00
lalaina rasamoelina
feb7af490a T943: Put the total of the priceat the bottom of the propal list 2013-06-14 15:46:11 +02:00
lalaina rasamoelina
9649e731b8 T935 put a filter on the author in the propal list 2013-06-14 15:05:58 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Marcos García
cf6bfcc9c4 Missing translations 2013-06-08 20:31:39 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Florian Henry
7c56da05b8 Add hook on propal/order/incoive list 2013-05-28 18:35:15 +02:00
Laurent Destailleur
6db07ac2d8 Fix: Several bugs into filter on statistics pages. 2013-05-20 19:24:27 +02:00
fhenry
e19e9e1c63 Add dol_syslog 2013-05-17 21:27:15 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
53ca1546d0 Fetch optionnal into fetch of propal 2013-04-26 16:58:04 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
52a1e81147 [ bug #842 ] Erreur SQL Propal 2013-04-23 14:43:32 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +02:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
Regis Houssin
17d5ab9774 Fix: no result with a number with a comma 
Conflicts:
	htdocs/fourn/facture/index.php

Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
 2013-04-19 09:57:13 +02:00
Regis Houssin
45300ccdd8 Fix: no result with a number with a comma 2013-04-19 09:55:22 +02:00
fhenry
acd3d136b5 [ task #798 ] Add range limit date on product/services as it is done on 
order and invoice
 2013-04-15 15:31:12 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
fhenry
dcd960a957 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
 2013-04-05 11:46:09 +02:00
Laurent Destailleur
d8a86453e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136 Optimize size of graph 2013-04-04 21:13:51 +02:00
Laurent Destailleur
607ebbfe8b Qual: Replace tab with div 2013-04-04 19:42:21 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
jfefe
71bb4149cc New : Automatic creation of the document to the closing of the propale depending on the model selected in the configuration 2013-03-16 02:08:07 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
Laurent Destailleur
0fe91796ef New: [ task #696 ] Remove "new stdClass();" when possible 2013-03-08 15:52:23 +01:00
jfefe
8b749eaafc Fix : extrafields are not saved on update (propale) 2013-03-06 01:34:32 +01:00
jfefe
9eee5f9509 Fix : extrafields for propale were note saved after creation 2013-03-06 00:18:41 +01:00
jfefe
3cefb62621 Fix : incorrect function used to retrieve extrafields for propal 2013-03-05 22:22:10 +01:00
jfefe
59627408c0 Edit extrafields on propal 2013-03-04 19:17:11 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
simnandez
7d9d575e40 [ task #731 ] Uniformize ref generation. Propals 2013-03-02 15:57:26 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
Grand Philippe
785e72d533 fix trad : change adresse versus address 2013-02-15 19:36:09 +01:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
simnandez
ad3645f7f4 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-25 11:37:30 +01:00
simnandez
03d6903248 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-24 12:53:42 +01:00
Regis Houssin
e8ce9cecf2 Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
fhenry
ff06b05b3d Fix Bug [ bug #681 ] Can't modify a line a business proposal 2013-01-15 23:04:42 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Maxime Kohlhaas
9911c64f0b Fix : $now not defined and proposal date used instead of end validity to display warning 2012-11-14 22:32:20 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00
Laurent Destailleur
9bee735c2d Fix: Bad code for specimen 2012-10-30 12:02:13 +01:00
Regis Houssin
89b794dcd0 Fix: avoid errors with IE 2012-10-25 15:01:04 +02:00
Laurent Destailleur
153997432f Fix: Several fix. 
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
 2012-10-13 17:00:38 +02:00
Laurent Destailleur
7385ea15db Doxygen 2012-10-13 13:03:39 +02:00
Maxime Kohlhaas
5a64e3b1ec Task # 104 : Commited these 2 files instead of translations files 2012-10-04 15:43:52 +02:00
Maxime Kohlhaas
3ca55eb058 Task # 104 : display invoice multi order link on third party page only if there are orders to bill + translations 2012-10-02 10:52:08 +02:00
Laurent Destailleur
84089f3e53 Fix: bas tabs when socid provided into stats pages 2012-09-21 00:28:11 +02:00
simnandez
b7837f9280 Fix: Localtaxes type only missing in propal update line 2012-09-18 18:18:30 +02:00
simnandez
76f3fb56ea Fix: Add type of product/service into propals for a correct localtaxes 
calculation
Fix: Localtax2_type for Spain must be 3
 2012-09-18 16:06:45 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Regis Houssin
84c61c9411 Fix: remove obsolete code and use "propal" instead "propale" 2012-09-13 16:11:08 +02:00
simnandez
2e37084c55 Fix: If price is 'TTC' we need to have the totals without VAT for a 
correct
calculation
Fix: The updateline of propal must include the localtaxes totals
 2012-09-12 17:48:45 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Regis Houssin
3c63307087 Fix: remove dead code 2012-09-06 12:30:03 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
35a0311d28 Fix: Checkstyle 2012-08-26 23:15:26 +02:00
Regis Houssin
becda06fd6 Fix: security 2012-08-25 19:40:08 +02:00
Regis Houssin
dcfc34e64e Fix: more better of better 2012-08-25 19:20:17 +02:00
Regis Houssin
4dd8119a9e Fix: use better method for avoid warnings 2012-08-25 19:08:06 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Marcos García
c49e458c6c Propal stats weren't showing average total for more than 1 year 2012-08-14 15:43:14 +02:00
Regis Houssin
9451edafd8 Fix: bad link and uniformize code 2012-08-01 18:40:47 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML 
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
 2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
beedf13324 Fix: restore broken feature, disable token renewal in ajax response 2012-07-29 09:54:58 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
241241bf0a Fixed some problems with translations 2012-07-28 17:34:21 +02:00
Marcos García
706b637389 Removed unused BackToList link params 2012-07-28 17:20:17 +02:00
Regis Houssin
1e07ed6af6 Fix: broken link 2012-07-28 09:54:47 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Regis Houssin
b2317fd3ee Fix: external user confidentiality 2012-07-26 18:11:06 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Marcos García
e6a192ba87 Renamed fk_demand_reason to fk_input_reason 2012-07-22 16:53:02 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
94b7aed116 Fix: strict mode avenue 2012-07-12 19:14:13 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
db4008850b Fix: missing include 2012-06-23 22:25:40 +02:00
Laurent Destailleur
f2de43b771 New: Can filter list of proposal, order or invoice on sales 
representative
 2012-06-23 20:39:20 +02:00
simnandez
cf85f6708e Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 15:43:00 +02:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Regis Houssin
b51cd362b0 Fix: problem with external modules and uniformize code 2012-06-09 18:40:36 +02:00
Regis Houssin
274734b828 Fix: stock message in session and reload the page for avoid url problem 
with jQuery fileupload
 2012-05-31 21:11:26 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac Fix: can't delete a files with quote 2012-05-30 08:30:25 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external 
modules
 2012-05-30 00:07:06 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view 
wrapper.
 2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404 Fix: jquery fileupload broken feature 2012-05-25 20:56:05 +02:00
Laurent Destailleur
81be50b91b Fix: [ bug #411 ] Can't modify most properties 2012-05-23 11:21:51 +02:00
Laurent Destailleur
864ca3090a Fix: [ bug #405 ] Late icon always displayed on comm/propal.php 2012-05-21 00:08:55 +02:00
Laurent Destailleur
f7263d1773 Fix: Do not lose filter 2012-05-05 20:07:34 +02:00
Laurent Destailleur
143e524db6 New: Can filter on contact 2012-05-05 17:45:17 +02:00
Laurent Destailleur
85f01691a0 Qual: Lists must be into a page list and not into same page than record. 
New: Add filter on contact into list.
 2012-05-05 17:28:52 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Laurent Destailleur
ff06360071 Fix: Overwritting code is not role of a template but of a module. 
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
 2012-04-28 17:01:25 +02:00
Grand Philippe
a8d12a7c48 to use personal contacts.tpl within personal theme 2012-04-27 11:13:59 +02:00
Regis Houssin
46234024c8 Fix: Bug #369 2012-04-18 12:42:41 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Regis Houssin
5d2da2c884 Fix: uniformize code 2012-03-22 08:33:44 +01:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Regis Houssin
3afb2878c2 Fix: broken indentation 2012-03-18 20:45:01 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Laurent Destailleur
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Regis Houssin
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Regis Houssin
bd4b24f1eb Fix: add <br> for default note tab 2012-03-17 18:27:31 +01:00
Regis Houssin
815ee68f8f Fix: use div instead table 2012-03-17 18:10:59 +01:00
Regis Houssin
281c6b7f2a New: sharing code of contact and note tabs 2012-03-17 16:05:58 +01:00
Regis Houssin
e84c77ba31 New: add template for infos and contacts tabs and show/hide bloc system 2012-03-16 22:02:14 +01:00
Regis Houssin
ccf1665837 Fix: missing status after set draft 2012-03-16 17:37:18 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Regis Houssin
5d0a8945c1 New: add getNomUrl() method 2012-03-14 19:17:04 +01:00
Regis Houssin
4e98687b13 Fix: remove old constants 2012-03-14 16:37:48 +01:00
Regis Houssin
5fbd8e4cee Fix: move method in common class 2012-03-14 11:11:46 +01:00
Regis Houssin
ba15a73831 Works on an alternative address management 2012-03-14 07:49:41 +01:00
Regis Houssin
4d1416d0e6 Fix: remove unused and deprecated method 2012-03-13 20:15:13 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Regis Houssin
e033f202d1 Fix: more clickless, remove "note" tab 2012-03-12 17:49:53 +08:00
Laurent Destailleur
b5fc41fadc Fix: Removed a lot of checkstyle warnings 2012-03-11 22:08:46 +01:00
Regis Houssin
ef7cd26ef2 Fix: wrong field name 2012-03-04 10:26:01 +01:00
Regis Houssin
5e402f667e Fix: php unit test warning 2012-03-04 10:13:52 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Laurent Destailleur
a829b10190 Fix: Autoselect current year if not defined 2012-02-16 19:08:04 +01:00
Regis Houssin
c3e245d24e Fix: start triggers before delete objects 2012-02-15 15:16:33 +01:00
Regis Houssin
6f3f1204fe Fix: delete linked object in propal delete function and uniformize code 2012-02-13 18:27:42 +01:00
Laurent Destailleur
cfaf1f0813 New: Can add tabs on statistics views. 2012-02-12 23:29:31 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
d9cd816b3c Qual: Merge month.php and index.php page 
Prepare for adding statistics page into new tabs.
 2012-02-11 00:11:49 +01:00
Laurent Destailleur
186258410e New: Add option to clean orphelins files into repair page 2012-02-08 16:41:06 +01:00
Laurent Destailleur
6cb0685b6f Qual: Uniformize hook names. All hooks to add information on 
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
 2012-02-06 17:18:19 +01:00
Laurent Destailleur
5974cde154 New: Automtic list of documents in ECM module is ok for customers, 
suppliers invoice, orders, customers orders, proposals and social
contributions.
 2012-02-06 14:34:58 +01:00
Regis Houssin
40276d42ff Fix: sql error with combobox and uniformize code 2012-02-03 19:06:37 +01:00
Regis Houssin
c6e4206907 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
f3a966a313 Fix: Missing name 2012-01-29 23:24:47 +01:00
Laurent Destailleur
83d63aa07b Fix: Date not initialized 2012-01-11 13:42:44 +01:00
Laurent Destailleur
a7e7450dd7 Fix: Error management if date is empty 2012-01-11 13:37:50 +01:00
Laurent Destailleur
9e065b2395 New: Dolgraph function works with jflot (use DOL_MAIN_GRAPH=artichow to 
use old libraries)
 2012-01-07 20:56:52 +01:00
simnandez
5ad9d7cb61 [ task #176 ] Allow to use ODT templates for prososal like it's done for 
invoices. Working with odt template
 2012-01-05 09:48:28 +01:00
Laurent Destailleur
cda132ea8c Qual: Some change to have graph lib able to use img disk generation 
libraries like javascript libraries.
 2011-12-17 15:55:49 +01:00
Laurent Destailleur
b78541a167 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-12-16 15:02:56 +01:00
Laurent Destailleur
b54da5a719 New: Can open back a commercial proposal 2011-12-16 14:59:09 +01:00
Juanjo Menent
83bef28418 Qual: Uniformize code 2011-12-16 12:47:23 +01:00
Juanjo Menent
62f676f2ff Qual: Uniformize code 2011-12-14 18:44:12 +01:00
Juanjo Menent
e652674784 Qual: Uniformize code 2011-12-14 18:09:34 +01:00
Regis Houssin
ec327c5330 Fix: remove unused parameters 
Fix: use dol_clone instead fetch
 2011-12-12 13:42:19 +01:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Laurent Destailleur
6189acc3b4 Fix: Amount must be HT 2011-12-01 23:09:50 +01:00
Laurent Destailleur
07ccc091ea Fix: Lang loaded 2011-12-01 23:01:15 +01:00
Laurent Destailleur
1c65768286 Fix: flot graph works with new json_encode 2011-12-01 22:58:32 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Laurent Destailleur
1770a46519 Qual: Removed tons of warning 2011-11-22 14:00:03 +01:00
Regis Houssin
065d7996f5 Fix: better with json_encode 2011-11-20 15:25:08 +01:00
Laurent Destailleur
9a43c8a14f Qual: Removed useless parameter 2011-11-12 12:59:06 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Laurent Destailleur
c16c09a451 Qual: Mutualize code to delete previews 2011-11-04 00:27:30 +01:00
Laurent Destailleur
7f0cca8fb9 Look: Enhancements into themes. 2011-11-03 01:59:13 +01:00
Juanjo Menent
5c9ba8a548 [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Regis Houssin
24c9a7d26d Fix: reorder line after update line with fk_parent_line 2011-10-06 00:11:53 +08:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
ebfc56e75f Fix: replace siezof by count 
Fix: update exclude dir
 2011-09-20 14:36:57 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
2a672b3d02 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
bf1a49c75d Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
5a951a86b5 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
d56fc98ed3 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
e8360b8b95 Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
bb24986a6e Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
6f7053dbcc Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
ac7b8484de Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
d7b943ec0f Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
7419982316 Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
7d5aef30c4 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
75dc8c84f7 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
6c030ab34b Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
821a864383 Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
6ce3a1b475 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
d0114638c2 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
48625a0793 Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
9ebbeb573c Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
dfaa066042 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
e7fb7b74e1 Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
c4a496cd05 Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
9e900196fb Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
d9408d1847 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
b8a377fa8f Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
411b3415eb Doxygen 2011-09-12 17:08:02 +00:00
Laurent Destailleur
a82261068f Doxygen 2011-09-12 07:46:27 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
74ae21cd51 Qual: Removed TODO 2011-09-10 13:31:15 +00:00
Laurent Destailleur
351a2974dd Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
044879c838 Doxygen 2011-09-02 23:57:26 +00:00
Laurent Destailleur
0e2946cec7 Doxygen 2011-09-03 00:19:56 +00:00
Laurent Destailleur
e5988ad241 Fix: Error management when adding notification 2011-09-02 23:41:55 +00:00
Laurent Destailleur
2d89e6609e Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
5be5852cf4 Fix: Third party emails must not be visible into notification page 2011-09-02 23:07:47 +00:00
Laurent Destailleur
42c86ce1ac Work on rpm package 2011-09-03 01:46:33 +00:00
Juanjo Menent
cac55067fb Qual: Uniformize code 2011-09-02 22:33:28 +00:00
Laurent Destailleur
55c5c5f9f5 Work on rpm package 2011-09-03 01:27:00 +00:00
Laurent Destailleur
f5f37fa8dc Qual: Uniformize code 2011-09-02 16:33:11 +00:00
Laurent Destailleur
d53b179102 Fix: Fix GNU address 
Doxygen
 2011-09-03 01:24:09 +00:00
Laurent Destailleur
f39c932b2e Qual: Uniformize code 2011-09-02 16:25:07 +00:00
Laurent Destailleur
26badd59f4 Doxygen 2011-09-03 00:27:02 +00:00
Juanjo Menent
116e215323 Uniformize code 2011-09-02 15:41:35 +00:00
Laurent Destailleur
1ca46d8ec4 Doxygen 2011-09-03 00:19:56 +00:00
Juanjo Menent
8f19ee66e4 Uniformize code 2011-09-02 14:31:53 +00:00
Laurent Destailleur
d1d145620d Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
9bdb1057e1 Fix: W3C 2011-08-31 15:30:56 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Laurent Destailleur
1aaf65c257 PDF works with us letter format 2011-08-31 14:42:47 +00:00
Juanjo Menent
a029fedac3 bug #34162: Bad link in prosprection area 2011-08-29 14:53:05 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
cfe34139cf Qual: Clean and uniformize code. 
Remove properties, that are not related to business, from parent business class commonobject.
 2011-08-22 22:04:21 +00:00
Laurent Destailleur
9f663d5677 Qual: Clean code 2011-08-20 15:11:31 +00:00
Laurent Destailleur
e9b113ade8 Qual: Mutualize some code 
Fix: Missing begin
Fix: Removed functions returning database cursor
 2011-08-14 03:13:50 +00:00
Laurent Destailleur
3f2e6bbf82 Qual: Removed dead code 2011-08-14 02:11:15 +00:00
Laurent Destailleur
acea604e54 Change signature of all call executHooks. 
Now they accept all the following signature:
executeHooks('method',$parameters,$object,$action)
 2011-08-10 22:47:33 +00:00
Regis Houssin
66d5d6905f Fix: works on repair broken features 2011-08-10 19:55:21 +00:00
Laurent Destailleur
e00eb762f4 Look: Uniformize code and array presentation 
Doc: Doxygen
 2011-08-08 14:25:44 +00:00
Laurent Destailleur
02c9c563e0 Fix: When a line is defined as option, it was not possible to remove "options" then. 2011-08-08 01:53:25 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Regis Houssin
d82e40b010 Fix: object is a parameter 2011-07-14 05:21:52 +00:00
Laurent Destailleur
e2b18d565a Fix: Bad order on documents pages 2011-07-06 20:56:48 +00:00
Regis Houssin
129c3dd101 Fix: uniformize code 
Fix: add confirm delete file
New: add upload and delete file triggers
 2011-07-05 16:10:56 +00:00
Regis Houssin
54effb5b27 Fix: add more triggers 2011-07-04 10:35:48 +00:00
Laurent Destailleur
df8da8678b Fix: pgql compatibility 2011-07-04 10:30:00 +00:00
Regis Houssin
f344dbdefe Fix: Name of hook must also be unique for each tab 2011-06-30 13:27:20 +00:00
Regis Houssin
039ac047f4 New: add possibility to change the default status label 2011-06-22 07:43:12 +00:00
Laurent Destailleur
3b5bfd5ae0 New: Statistics support filtering on user. 2011-06-13 14:17:44 +00:00
Laurent Destailleur
f46492befe New: Statistics support filtering on user. 2011-06-13 13:42:51 +00:00
Laurent Destailleur
2ffb4f2d02 Qual: Uniformize user interface 2011-06-13 13:07:10 +00:00
Laurent Destailleur
7f852d293c Fix: Avoid wrap with chrome. 
Fix: Disable lightbox. Does not works with showphoto.
 2011-06-12 22:13:05 +00:00
Laurent Destailleur
baf173bb80 Qual: Shorter legend 2011-06-06 23:59:33 +00:00
Laurent Destailleur
a3755324c0 New: Graph js librairie can accept percents with pie. 2011-06-06 22:23:24 +00:00