Laurent Destailleur
c785c44b1b
Fix: Use correct constants
2013-05-07 13:18: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
95a2073da3
Fix: Bad constant
2013-05-07 12:59:19 +02:00
simnandez
a7a10c370f
Fix: Bad constant
2013-05-07 12:57:23 +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
Juanjo Menent
ee0e9f62b5
Merge pull request #928 from marcosgdf/holidays-improvements
...
Holidays module improvements
2013-05-06 08:23:37 -07: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
Juanjo Menent
36528ca264
Merge pull request #917 from FHenry/3.4
...
Fix margin calculation
2013-05-06 07:00:45 -07:00
Juanjo Menent
934657cc2f
Merge pull request #916 from FHenry/3.3
...
Fix margin calculation problem
2013-05-06 06:57:14 -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
fhenry
441ad8c6d0
Fix Trad Fr
2013-05-06 09:53:58 +02:00
fhenry
8bd7c6a763
Fix Trad Fr
2013-05-06 09:53:23 +02:00
aponzio
68fefb0df1
Update banks.lang
...
Improved translation of menu item ("Bonifici e giroconti" instead of "Bonifici bancari"): it makes easier to understand that you can transfer money to another of your accounts
2013-05-05 13:29:46 +03:00
aponzio
b9dcecedc0
Update sendings.lang
...
Fixed autogenerated translation
2013-05-05 13:21:41 +03:00
