Commit Graph

39662 Commits

Author SHA1 Message Date
Laurent Destailleur
a6e4ba7001 Fix: No limits for drafts lists 2013-12-01 19:40:36 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a
contact.
2013-12-01 18:14:19 +01:00
Laurent Destailleur
f207aabe7a Fix: When editing thirdparty, result is not refreshed 2013-12-01 18:13:57 +01:00
Laurent Destailleur
d39ed05c5d Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/comm/propal/list.php
2013-12-01 16:05:09 +01:00
Laurent Destailleur
8d1e10cd76 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-01 16:02:19 +01:00
Laurent Destailleur
f86cf6c440 Check parameters of script 2013-12-01 15:22:47 +01:00
Laurent Destailleur
71a85464d5 Check parameters of script 2013-12-01 15:22:29 +01:00
Laurent Destailleur
a7c246cec1 Check parameters of script 2013-12-01 15:21:58 +01:00
Laurent Destailleur
e4860679de Merge pull request #1327 from FHenry/3.4
[ bug #1159 ] Commercial search "other" give p.note do not exists
2013-11-29 03:18:13 -08:00
Cédric Salvador
22d31817de made getVATRates synchronous to avoid concurrency problems 2013-11-29 12:13:23 +01:00
Laurent Destailleur
b3ff58e864 Merge pull request #1330 from grandoc/3.5
fix management of all errors message
2013-11-29 02:58:21 -08:00
Laurent Destailleur
ecd14cb751 Merge pull request #1326 from grandoc/3.5
3.5
2013-11-29 02:58:06 -08:00
Grand Philippe
d024ec3daa fix management of all errors message 2013-11-29 11:29:39 +01: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
Florian Henry
b9d37fd6f7 [ bug #1159 ] Commercial search "other" give p.note do not exists 2013-11-28 14:28:03 +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
1ddf9f6ac5 Fix: Not coherent filename 2013-11-24 19:34:25 +01: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