Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
fhenry
207f6cea28 Fix [ bug #883 ] Silent pgsql errors in comm/index.php 2013-05-07 16:59:27 +02:00
fhenry
16e06736e6 Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de 
prélèvement
 2013-05-07 16:50:27 +02:00
fhenry
de4b9b01bf Fix Bug [ bug #880 ] Prelevement section is broken 2013-05-07 15:34:40 +02:00
fhenry
1fc693f692 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-07 15:21:10 +02:00
zcattacz
eecaa57434 Oops wrong case 2013-05-07 21:08:33 +08:00
zcattacz
ac9f5180b0 English translation minor improvement 2013-05-07 20:47:16 +08:00
fhenry
c623e7913b Update migration script with new idx index unique name opensurvey 2013-05-07 14:31:11 +02:00
Regis Houssin
8836b30a02 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:11 +02:00
fhenry
f016517ed1 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-07 13:55:16 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-05-07 13:08:30 +02:00
simnandez
ca9a2b281a New: [ task #812 ] Add more Scripts. expire contract services to 
representatives
 2013-05-07 12:52:14 +02:00
Laurent Destailleur
c28ef8a557 Fix: Delete deprecated files during install as they create conflicts 
when migrating from old versions.
 2013-05-07 12:51:45 +02:00
fhenry
6427129480 Fix extrafields update/save on User/fiche.php 2013-05-07 12:25:32 +02:00
Cedric GROSS
d1c1cf6bc0 Fix invalid permission test when deleting services 2013-05-07 12:07:06 +02:00
simnandez
70dedc49b2 [ task #877 ] Reorganize menus. Works with auguria menu 2013-05-07 10:15:49 +02:00
fhenry
b3f40b900b Make constraint SQL unique name (Mandatory for PgSQL) 2013-05-07 09:26:31 +02:00
Marcos García
0a90af0b99 Fixed untranslated string 2013-05-06 23:31:19 +02:00
Marcos García
c81cf6364a Removed innecesary whitespace when no picto is displayed 2013-05-06 22:59:50 +02:00
Marcos García
20e0fe4b24 Corrected translation key 2013-05-06 22:24:05 +02:00
Marcos García
f9093e00bb Missing es_ES translations 2013-05-06 18:14:16 +02:00
Marcos García
44ef25a367 Converted recent changes to UTF-8 encoding 2013-05-06 18:10:41 +02:00
Laurent Destailleur
fe2a160ca8 Merge pull request #926 from aponzio/develop 
Minor fixes to language files
 2013-05-06 09:05:56 -07:00
Laurent Destailleur
5efc298431 Merge pull request #915 from defrance69/patch-6 
Update categ.php
 2013-05-06 09:05:19 -07:00
Regis Houssin
3aa049b661 Fix: regression 2013-05-06 17:57:33 +02:00
Marcos García
9f537cedd1 Replaced "Jours" with DurationDays translation key 2013-05-06 17:48:20 +02:00
Marcos García
da61a24831 Missing translations 2013-05-06 17:47:53 +02:00
Marcos García
f5b04fdfe5 Stetic fix: Select was not valigned 2013-05-06 17:47:21 +02:00
Marcos García
896a60296c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-06 17:22:31 +02:00
Juanjo Menent
0e49ec93f9 Merge pull request #929 from marcosgdf/holidays-minor 
Minor changes in holidays module
 2013-05-06 08:17:25 -07:00
Marcos García
bd9849c1aa Fixed bug with holidays log 2013-05-06 17:15:49 +02:00
Juanjo Menent
a53e4123eb Merge pull request #927 from marcosgdf/holidays-bug 
Fixed bug with holidays log
 2013-05-06 08:14:46 -07:00
Marcos García
bbe1db0e9f Replaced addslashes with $this->db->escape 2013-05-06 17:13:43 +02:00
Juanjo Menent
192ef564be Merge pull request #924 from marcosgdf/minor 
Replaced addslashes with $this->db->escape
 2013-05-06 08:12:19 -07:00
Marcos García
e1913f4a13 Stetic fix: Select was not valigned 2013-05-06 17:07:20 +02:00
Marcos García
7e11f7466a Missing translations 2013-05-06 17:07:12 +02:00
Marcos García
05be90a220 Using month selector instead of direct input 2013-05-06 17:06:41 +02:00
Marcos García
f4973d5aa9 Holidays log now shows recent changes first 2013-05-06 17:04:21 +02:00
Marcos García
9935dad500 Wrong indentation 2013-05-06 17:04:15 +02:00
Marcos García
b830c1dd8c Removed "event" word from event description and changed ActionTypeCP to Description 2013-05-06 17:04:04 +02:00
Marcos García
0846f4678b User links in log view 2013-05-06 16:53:22 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
Marcos García
d0635901a6 Fixed bug with holidays log 2013-05-06 16:45:03 +02:00
Juanjo Menent
d391a21a68 Merge pull request #925 from marcosgdf/task-858 
New: [ task #858 ] Holiday module: note on manual holiday assignation
 2013-05-06 07:13:59 -07:00
Marcos García
12971fa139 Corrected es_ES translations 2013-05-06 16:11:42 +02:00
Juanjo Menent
ea2109b635 Merge pull request #922 from marcosgdf/translations 
Corrected es_ES translations
 2013-05-06 07:06:01 -07:00
Juanjo Menent
c05d593a2a Merge pull request #920 from marcosgdf/refactor 
Removed duplicated code
 2013-05-06 07:04:15 -07:00
Juanjo Menent
3bbde9b8e4 Merge pull request #918 from FHenry/develop 
Fix margin calculation problem, and add myuser_fullname and myuser_logo
 2013-05-06 07:01:38 -07:00
fhenry
0bb9ee158a Fix trigger call ficher inter create 2013-05-06 13:47:33 +02:00
fhenry
ae4e861147 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-06 09:54:42 +02:00