Commit Graph

34626 Commits

Author SHA1 Message Date
Regis Houssin
9af8637bd7 Fix: possibility to activate jquery plugins with a constant 2013-01-03 19:13:09 +01:00
Laurent Destailleur
4e27969317 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/boxes/box_activity.php
2013-01-02 22:15:58 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 21:35:28 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 18:43:59 +01:00
Regis Houssin
46a9b5ec53 Merge pull request #566 from defrance69/patch-8
Update htdocs/core/boxes/box_activity.php
2013-01-02 07:31:59 -08:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
BENKE Charles
4eab7b004e Update htdocs/core/boxes/box_activity.php
new release with "last 2 year bills"
2013-01-02 11:08:05 +01:00
Laurent Destailleur
049a6dc742 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-31 14:00:38 +01:00
Laurent Destailleur
83a3720f43 Merge pull request #563 from marcosgdf/3.3
Little bug fixes and translations
2012-12-31 04:49:21 -08:00
Laurent Destailleur
53ee487358 Fix: Use standard syntax for version 2012-12-31 13:40:35 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Laurent Destailleur
f7a53eebfb Fix: Suggested start date of subscription must be validation date. 2012-12-31 13:39:42 +01:00
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +01:00
Marcos García
d7121f6351 Updated demo trigger class with last changes in triggers 2012-12-31 05:30:09 +01:00
Marcos García
93c5acbf39 There's actually no CONTRACT_MODIFY trigger 2012-12-31 05:26:56 +01:00
Marcos García
50975b61b7 Revert "Fixed typo introduced in commit ca2b3f11b166f395e11af74d825989737920e925"
This reverts commit a90db96421.
2012-12-31 05:22:18 +01:00
Marcos García
adc9897d16 Agenda contacts type wasn't shown in $elementList 2012-12-31 05:10:35 +01:00
Marcos García
3b68faa119 Added missing translations 2012-12-31 05:10:18 +01:00
Marcos García
632b2d7a05 Fixed a bug when modifying a 0% local tax 2012-12-31 04:11:56 +01:00
Marcos García
406ce9e11c Update changelog + update deprecated triggers in database 2012-12-31 04:11:13 +01:00
Marcos García
a90db96421 Fixed typo introduced in commit ca2b3f11b1 2012-12-31 04:10:48 +01:00
Laurent Destailleur
6b6f725f99 Update doc file 2012-12-31 03:13:11 +01:00
Laurent Destailleur
f345e43dad Fix: date 2012-12-30 22:23:23 +01:00
Laurent Destailleur
815f43904d Fix: Warning if setup not complete 2012-12-30 21:56:53 +01:00
Laurent Destailleur
4fe1ba33f9 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
2012-12-30 18:00:07 +01:00
Laurent Destailleur
df43d477fc Merge pull request #562 from simnandez/3.3
Fix: Supplier is mandatory into adding invoice suppliers
2012-12-30 08:38:34 -08:00
Laurent Destailleur
86c9011437 Merge pull request #561 from marcosgdf/3.3
Updated changelog + also removed unused triggers when migrating from 3.2.X
2012-12-30 08:36:25 -08:00
Laurent Destailleur
eef861a743 Fix: Update copyright file 2012-12-30 17:26:43 +01:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
18bfceafca Merge remote-tracking branch 'origin/3.3' into develop 2012-12-30 14:17:05 +01:00
Laurent Destailleur
a1b0fbcc2c Fix: [ bug #659 ] Comment in recurrent invoices is not stored
Fix: Missing payment mode
2012-12-30 14:14:52 +01:00
Laurent Destailleur
201829e60c Fix:[ bug #653 ] Error while creating additional attributes 2012-12-30 13:49:37 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Marcos García
c3a75307b0 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into 3.3 2012-12-30 12:37:48 +01:00
Laurent Destailleur
ca2b3f11b1 Fix: Several fix in trigger names 2012-12-30 12:24:53 +01:00
Laurent Destailleur
3fb60304db Fix: Css for ecm module 2012-12-30 12:02:54 +01:00
simnandez
f05176dc8a Fix: Date is mandatory into adding customer orders 2012-12-30 10:49:11 +01:00
simnandez
9732a2f336 Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:26:18 +01:00
simnandez
f0f45b70da Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:24:20 +01:00
Marcos García
10fff57b51 Let's call them just triggers 2012-12-30 02:48:08 +01:00
Laurent Destailleur
b8303bdd5f Fix: CSS 2012-12-29 23:40:16 +01:00
Marcos García
99bf09dc9e Updated changelog + also removed unused triggers when migrating from 3.2.x 2012-12-29 18:28:24 +01:00
Laurent Destailleur
2d0dea18ce Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/compta/bank/search.php
2012-12-29 17:38:12 +01:00
Laurent Destailleur
703c82f9e2 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 17:35:07 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
a9e9b761cc Merge pull request #560 from FHenry/develop
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:33:17 -08:00