lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcos García
e2a73839bc Replaced addslashes with $this->db->escape 2013-05-04 20:17:05 +02: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
Marcos García
a5009fd555 Corrected es_ES translations 2013-05-04 19:35:38 +02:00
fhenry
bdb81803bd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-04 09:06:32 +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
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
9e847884d1 Prepare dev branch 2013-05-03 18:41:14 +02:00
Laurent Destailleur
1c9caeb0d3 Fix: CRLF 2013-05-03 18:33:23 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
c8ef07a889 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +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
fhenry
4a1eb1a588 Fix margin calculation 2013-05-03 15:26:20 +02:00
fhenry
a35a44b23e Fix margin calculation problem 2013-05-03 15:22:41 +02:00
BENKE Charles
5c766d255f Update categ.php 
Add update label feature
 2013-05-03 16:02:04 +03:00
Laurent Destailleur
8dcb396fb8 Merge pull request #914 from FHenry/3.4 
fix margin calculation problem
 2013-05-03 04:18:15 -07: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
Laurent Destailleur
ff80e3b031 Fix: latin to utf8 2013-05-03 12:28:28 +02:00
Laurent Destailleur
b7f3f07fc7 Fix: [ bug #840 ] fichetwothirdright 65% to 55% 2013-05-03 12:13:10 +02:00
Laurent Destailleur
c850d413f4 Fix: [ bug #871 ] Erreur MAJ 3.2 -> 3.3 avec pgsql 2013-05-03 12:00:55 +02:00
fhenry
30d888c34f Fix comment on facturedet table description 2013-05-03 11:52:21 +02:00
Laurent Destailleur
880daa4375 Fix: log file permission during install 2013-05-03 11:51:26 +02:00
fhenry
9038549d0d fix margin calculation problem 2013-05-03 11:50:13 +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