Commit Graph

1470 Commits

Author SHA1 Message Date
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