Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-23 09:13:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,648 Commits 38 Branches 191 Tags
ecd14cb7514e9466c5d29f86f6a73c0fcd00a00a
Commit Graph

39648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ecd14cb751 Merge pull request #1326 from grandoc/3.5 
3.5
 2013-11-29 02:58:06 -08:00
Grand Philippe
438d7b0fb2 fix regression 2013-11-29 11:04:22 +01:00
Grand Philippe
c0650d6da3 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-29 08:30:46 +01:00
Laurent Destailleur
a0c0578863 No need to send email for each error. First one is enough. 2013-11-28 19:06:34 +01:00
Laurent Destailleur
d0b05bb5af Fix: Restore style code lost by a commit. 2013-11-28 18:55:36 +01:00
Laurent Destailleur
d1e62bebf0 Fix: Removed a merged that we ddidn't want. 2013-11-28 17:01:37 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Grand Philippe
1ac5bd3f28 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-28 16:39:29 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
philippe
d5606b6045 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2013-11-28 15:09:16 +01:00
Laurent Destailleur
a3e55822a4 Missing translation 2013-11-28 14:36:13 +01:00
Grand Philippe
1fc50c137b Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-28 14:25:42 +01:00
Grand Philippe
c88bb553bd fix wrong example path 2013-11-28 14:25:11 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Laurent Destailleur
894e6a296f Merge pull request #1324 from FHenry/3.4 
Fix [ bug #1156 ] Update TVA mass update tools do not work
 2013-11-27 16:09:35 -08:00
Laurent Destailleur
74d6698f7d Merge pull request #1325 from FHenry/3.5 
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
 2013-11-27 16:08:02 -08:00
Florian Henry
5f8e896e0c Fix [ bug #1154 ] Error when closing a service in a contract (pgsql) 2013-11-27 22:58:49 +01:00
Florian Henry
afc729c694 [ bug #1153 ] SQL Error on the VAT main screen (with pgsql) 2013-11-27 22:49:54 +01:00
Florian Henry
2178ab6007 Fix [ bug #1156 ] Update TVA mass update tools do not work 2013-11-27 22:05:29 +01:00
Laurent Destailleur
c3af8b6b29 Sync from transifex 2013-11-27 14:59:02 +01:00
Laurent Destailleur
6729f03ee6 Merge pull request #1323 from grandoc/3.5 
fix language and standardize code
 2013-11-26 07:28:30 -08:00
Laurent Destailleur
0383dc4706 Fix: 2 bugs during validation of a member 2013-11-26 13:10:00 +01:00
Laurent Destailleur
18ed9d5ca7 Fix: Filter on accountancy report were lost when using "print" view. 2013-11-25 16:51:30 +01:00
Grand Philippe
e8e5f4d943 missing trad 2013-11-25 13:55:01 +01:00
Grand Philippe
203a98d4ae fix language and standardize code 2013-11-25 10:30:02 +01:00
Laurent Destailleur
216e9b390d Merge pull request #1321 from FHenry/3.4 
Fix [ bug #1145 ] Agenda button list type do not display
 2013-11-24 12:16:27 -08:00
Laurent Destailleur
4cf2e2503c Merge pull request #1320 from grandoc/3.5 
3.5
 2013-11-24 12:13:48 -08:00
Laurent Destailleur
baebc7e91d Fix: Not coherent filename 2013-11-24 19:33:22 +01:00
Florian Henry
f1d0879419 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-24 18:07:47 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Grand Philippe
fae27842b7 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-24 14:50:07 +01:00
Grand Philippe
08e44135bf add missing trad 2013-11-24 14:47:44 +01:00
Laurent Destailleur
65b6dca554 Fix: business rule to protect button and action was not synchronized 2013-11-24 13:46:40 +01:00
Laurent Destailleur
4cf2c3d58c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2013-11-24 13:41:54 +01:00
Laurent Destailleur
8cd0647d7e Fix: business rule to protect button and action was not synchronized 2013-11-24 13:40:33 +01:00
Laurent Destailleur
bb8f113e67 Merge pull request #1319 from grandoc/3.5 
add a Social contributions type and fix some language stuff
 2013-11-24 04:29:19 -08:00
Laurent Destailleur
b75137d4ff Fix files that should not mix tab and spaces indent. 2013-11-24 13:02:20 +01:00
Grand Philippe
1f7e6a42c2 add a Social contributions type and fix some language stuff 2013-11-24 11:33:36 +01:00
Laurent Destailleur
e45406694b Fix: no filter is value is '' 2013-11-23 19:28:41 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
628e8bea83 Fix: Missing error message when files were too large. 2013-11-23 15:22:27 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Laurent Destailleur
6ffdc039a2 Fix: When option is not set, it must not appears as set. 2013-11-23 14:51:49 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
8496b1787c Color too agressive 2013-11-23 14:46:46 +01:00
Florian Henry
cca303cee6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-22 15:07:16 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Laurent Destailleur
4a1f6713ff Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-11-21 18:45:33 +01:00
Laurent Destailleur
6f5e78d27e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 18:42:14 +01:00