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
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
7428c11489
Merge pull request #909 from marcosgdf/bug-866
...
Fixed bug #866 : Standing order from an invoice suggests invoice total am...
2013-05-03 01:09:07 -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
Laurent Destailleur
7bb820826f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-02 23:48:33 +02:00
Laurent Destailleur
7e8027218d
Merge pull request #912 from FHenry/develop
...
Various bug fixing for PgSQL
2013-05-02 14:47:56 -07:00
Laurent Destailleur
16fbe72f69
Fix: Fedora rules
2013-05-02 23:36:32 +02:00
fhenry
f9328f4018
Propal don't move
2013-05-02 23:00:33 +02:00
