Commit Graph

42864 Commits

Author SHA1 Message Date
Laurent Destailleur
7ac22cf7d2 Qual: no more currency into output, must be included into price function 2014-08-04 09:05:51 +02:00
Laurent Destailleur
3024d82536 Merge pull request #1786 from atm-maxime/develop
Fix on class not extending commonobject
2014-08-04 08:58:54 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
2014-08-04 00:02:00 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
86b2887d44 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-03 23:54:05 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Laurent Destailleur
4c91788941 Fix: Can not set option when using in nojs mode. 2014-08-03 22:08:25 +02:00
Laurent Destailleur
1f2cc71975 New: Supervisor is now visible into user list. 2014-08-03 11:36:00 +02:00
Laurent Destailleur
42008ae8cb Fix: Bad translation 2014-08-03 11:35:35 +02:00
Laurent Destailleur
12ff7a8af5 Look: Refresh install style with more neutral colors. Select line style
is now stored into css. Removed all images for install process.
2014-08-03 11:18:32 +02:00
Laurent Destailleur
c11ff57fbe Fix: The type is a code so must not contains any space.
Fix: State is not linked to region.
2014-08-03 11:17:24 +02:00
Laurent Destailleur
331cb38a10 A little clean of tables. 2014-08-02 21:56:39 +02:00
Laurent Destailleur
8ed21f606e Qual: states are linked to regions. 2014-08-02 21:16:43 +02:00
Laurent Destailleur
9eab1f51cc Fix: remove debug output 2014-08-02 17:27:45 +02:00
Laurent Destailleur
6ff57e57c2 Fix: external link is visible when a module is using tabhelp of
dictionary.
2014-08-02 00:34:54 +02:00
Laurent Destailleur
6a815dd585 Fix: external link is visible when a module is using tabhelp of
dictionary.
2014-08-02 00:34:15 +02:00
Laurent Destailleur
7c1af329f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2014-08-01 22:26:17 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Juanjo Menent
eee17589b2 Fix: Price by customer: a client must be able to have multiple products
with customer prices
2014-08-01 18:24:38 +02:00
Juanjo Menent
c15da5f257 Fix: Price by customer: a client must be able to have multiple products
with customer prices
2014-08-01 18:22:39 +02:00
Laurent Destailleur
41f846ac6e Fix: Bad param 2014-08-01 17:13:23 +02:00
Laurent Destailleur
1c39e7ecbd Fix: Bad param 2014-08-01 17:11:18 +02:00
Laurent Destailleur
ed52fc20d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-01 14:51:58 +02:00
Laurent Destailleur
605919be76 Fix: Too many parameter
Fix: Can't delete bank account
2014-08-01 14:51:40 +02:00
Laurent Destailleur
c6d491b0b9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 14:49:24 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Juanjo Menent
268aabbacd Fix: Price by customer 2014-08-01 13:27:54 +02:00
Juanjo Menent
32e110b6d9 Fix: Price by customer 2014-08-01 13:25:29 +02:00
Laurent Destailleur
a5a7fb4967 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-01 11:15:45 +02:00
Laurent Destailleur
e18caccdc9 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-01 11:14:02 +02:00
Laurent Destailleur
6917b97420 Fix: Missing link.lang file into transifex sync. 2014-08-01 11:13:13 +02:00
Maxime Kohlhaas
94fee7af70 Call trigger added in commonobjectline 2014-08-01 08:59:08 +02:00
Laurent Destailleur
cf72c05a99 Fix: debian package provided by dolibarr team use embedded libraries. 2014-08-01 02:11:37 +02:00
Laurent Destailleur
f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/langs/fr_FR/main.lang
2014-08-01 02:05:38 +02:00
Laurent Destailleur
33a60bc14e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 02:02:14 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
852b78f79f Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for
constants into database driver classes.
2014-08-01 00:53:29 +02:00
Laurent Destailleur
bdc9d5b463 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-01 00:34:24 +02:00
Laurent Destailleur
b1e3ac5181 Track we renamed getmypid into dol_getmypid. 2014-08-01 00:29:13 +02:00
Laurent Destailleur
1e09200347 Prepare to add foreign key toward parent into table
llx_accountingaccount.
2014-07-31 20:49:50 +02:00
Laurent Destailleur
b78537730a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 20:39:03 +02:00
Laurent Destailleur
218fb88eef Merge pull request #1788 from aspangaro/develop-accounting2
Accountancy :: account_parent must be an int (again)
2014-07-31 20:17:49 +02:00
Laurent Destailleur
9fff30416a Qual: Remove usage of getStaticMember function dir constants. 2014-07-31 20:12:21 +02:00
Laurent Destailleur
202774de0b Merge pull request #1791 from frederic34/patch-graphbox
External user must not have graph box with all stats
2014-07-31 17:51:31 +02:00
Laurent Destailleur
41865f934c Merge pull request #1794 from frederic34/patch-1
Update propal.php
2014-07-31 17:50:14 +02:00