Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,922 Commits 36 Branches 191 Tags
a6233a738c2f67e557b54b144066a7cb15c728e8
Commit Graph

36922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
094a7e5ea9 Fix: Bad constant 2013-05-07 13:20:50 +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
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
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
Regis Houssin
3aa049b661 Fix: regression 2013-05-06 17:57:33 +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
Juanjo Menent
a53e4123eb Merge pull request #927 from marcosgdf/holidays-bug 
Fixed bug with holidays log
 2013-05-06 08:14:46 -07: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
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
ea2109b635 Merge pull request #922 from marcosgdf/translations 
Corrected es_ES translations
 2013-05-06 07:06:01 -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
Marcos García
e2a73839bc Replaced addslashes with $this->db->escape 2013-05-04 20:17:05 +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
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +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
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
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
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
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
Laurent Destailleur
97de97de9d Prepare branch 3.4 3.4.beta1_20130502 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