simnandez
bbb4fcad28
Trad: Added missing translations
2013-05-08 18:00:15 +02:00
Marcos García
e86a742383
Added missing translations
2013-05-08 17:56:32 +02:00
Juanjo Menent
278d2c6cb1
Merge pull request #935 from marcosgdf/translations-develop
...
Corrected translations of info tooltips in document models description
2013-05-08 08:54:44 -07:00
simnandez
a91dc0e32a
Trad: Spanish predefined mail content more friendly
2013-05-08 17:52:08 +02:00
Marcos García
edfcfb9bbd
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
...
Conflicts:
htdocs/admin/commande.php
htdocs/admin/expedition.php
htdocs/admin/facture.php
htdocs/admin/fichinter.php
htdocs/admin/livraison.php
htdocs/admin/supplier_invoice.php
htdocs/admin/supplier_order.php
htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
simnandez
b9583d389e
Trad: Add products missing translations
2013-05-08 12:24:50 +02:00
simnandez
bf043fc845
Fix: Remove windows CR/LF
2013-05-08 09:28:05 +02:00
Laurent Destailleur
19f49971bb
Merge pull request #930 from marcosgdf/utf-8
...
Converted recent changes to UTF-8 encoding
2013-05-08 00:12:36 -07:00
Laurent Destailleur
fc158d1e10
Merge pull request #934 from KreizIT/develop
...
Fix invalid permission test when deleting services
2013-05-08 00:11:01 -07:00
Marcos García
3d5cb4e8de
Style improvements in model document selector
2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72
Corrected translations of info tooltips in document models description
2013-05-07 22:04:08 +02:00
simnandez
46c1b87b32
New: [ task #812 ] Add more Scripts. expire contract services to
...
representatives and customers
2013-05-07 17:43:54 +02:00
Regis Houssin
8836b30a02
Fix: missing rename note to note_private and add note_public
2013-05-07 14:26:51 +02:00
simnandez
ca9a2b281a
New: [ task #812 ] Add more Scripts. expire contract services to
...
representatives
2013-05-07 12:52:14 +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
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
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
Marcos García
bd9849c1aa
Fixed bug with holidays log
2013-05-06 17:15:49 +02:00
Marcos García
bbe1db0e9f
Replaced addslashes with $this->db->escape
2013-05-06 17:13:43 +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
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
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
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
Marcos García
3eb6d3edb1
Translated some comments
2013-05-04 20:09:39 +02:00
Marcos García
c21390ab83
New: [ task #858 ] Holiday module: note on manual holiday assignation
2013-05-04 20:08:17 +02:00
simnandez
15ede98fe7
New: [ task #877 ] Reorganize menus. Init works
...
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
Laurent Destailleur
9e847884d1
Prepare dev branch
2013-05-03 18:41:14 +02:00
fhenry
d8f1818f86
Fix margin calculation problem, and add myuser_fullname and myuser_logo
...
into standard ODT replacement
2013-05-03 15:44:35 +02:00
BENKE Charles
5c766d255f
Update categ.php
...
Add update label feature
2013-05-03 16:02:04 +03:00
Laurent Destailleur
f926ddb417
Merge pull request #913 from FHenry/develop
...
Fix bug on margin calculation (column price no more use) use total_ht/qty
2013-05-03 04:18:03 -07:00
fhenry
30d888c34f
Fix comment on facturedet table description
2013-05-03 11:52:21 +02:00
fhenry
8cfbcd47ca
Fix margin calculation
2013-05-03 11:26:00 +02:00
fhenry
a38287ffdf
Deprecated column price into llx_facturedet
2013-05-03 11:16:22 +02:00
fhenry
97192510e2
Fix bug on margin calculation (column price no more use) use subprice
...
instead.
2013-05-03 11:09:58 +02:00
Laurent Destailleur
97de97de9d
Prepare branch 3.4
2013-05-03 10:17:46 +02:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +02:00
Laurent Destailleur
c17cd04686
Merge pull request #904 from defrance69/patch-5
...
Update modSociete.class.php
2013-05-03 01:09:37 -07:00
