lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,824 Commits 43 Branches 150 Tags 886 MiB
54a2d3ca72
Commit Graph

31769 Commits

Author SHA1 Message Date
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
simnandez
70dedc49b2 [ task #877 ] Reorganize menus. Works with auguria menu 2013-05-07 10:15:49 +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
Laurent Destailleur
776655d8c6 Merge pull request #903 from defrance69/patch-4 
Update modProduct.class.php
 2013-05-03 01:09:29 -07:00
Laurent Destailleur
2e4c73ebc4 Fix: Link to phone with tel: must be only onto terminal that support 
protocol "tel:"
 2013-05-03 10:06:54 +02:00
Marcos García
c65620ab62 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866 
Conflicts:
	ChangeLog
 2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f Enhanced fix 2013-05-03 08:16:31 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
f9328f4018 Propal don't move 2013-05-02 23:00:33 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676 Merge pull request #911 from atm-maxime/develop 
Fix : extrafields were save without escape
 2013-05-02 10:43:14 -07:00
Laurent Destailleur
4687350337 Merge pull request #910 from marcosgdf/3.3-translations 
Translation improvements + fixed statut image of returned prelevement
 2013-05-02 10:42:53 -07:00
Laurent Destailleur
3a531f048a Merge pull request #906 from grandoc/3.3 
fix: undefined property
 2013-05-02 10:42:13 -07:00
Laurent Destailleur
f595a7ed0c Merge pull request #905 from FHenry/develop 
Add table extrafield for commande fournisseur
 2013-05-02 10:41:02 -07:00
Laurent Destailleur
fa497cf5fc Fix: Trans and wrap 2013-05-02 18:25:27 +02:00