lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,602 Commits 43 Branches 150 Tags 886 MiB
4eab7b004e
Commit Graph

34602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
bc489773e8 Merge pull request #559 from FHenry/3.3 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:32:47 -08:00
Laurent Destailleur
bb3241b70b Merge pull request #557 from marcosgdf/minor 
Removed unuseful code
 2012-12-29 08:31:20 -08:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Laurent Destailleur
caf4130fb7 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2 Fix: Missing field 2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
Laurent Destailleur
a84e06cbfc Merge pull request #555 from simnandez/3.3 
Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012
 2012-12-29 07:28:55 -08:00
fhenry
5099bc5e89 Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:06:11 +01:00
fhenry
32966fe25f Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:02:02 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
8cae374d2a Merge remote-tracking branch 'origin/3.3' into develop 2012-12-29 07:01:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Laurent Destailleur
215139ca72 Fix: Test for css must match test for js 2012-12-29 05:14:07 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Marcos García
4af2a4f875 Improved agenda translations 2012-12-29 02:21:00 +01:00
Laurent Destailleur
6ff9444903 Fix: temporary folder when creating ODT segments on Windows or system… 2012-12-29 01:25:56 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Marcos García
316552f4ea Added missing translation and fixed references to incorrect variable 2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93 Fixed donation payment mode translation and another problem with donation edit form 2012-12-29 00:46:25 +01:00
Marcos García
c8eac78a8d Translated labels that weren't being translated and improved es_ES translations 2012-12-29 00:24:55 +01:00
Marcos García
7ff5db3385 Improved and added missing es_ES translations 2012-12-29 00:21:50 +01:00
Laurent Destailleur
b1ad7867e5 Merge remote-tracking branch 'origin/3.3' into develop 2012-12-28 22:12:08 +01:00