Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
34,940 Commits 36 Branches 189 Tags
3bcd506e73dd753d8afdaea2e2fa1fedec4ffbf3
Commit Graph

34940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3bcd506e73 Fix: demo modules list 2013-04-10 23:06:38 +02:00
Laurent Destailleur
43d4bb6155 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-10 19:30:51 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
c4d0c4c3e5 Merge pull request #821 from FHenry/3.3 
Fix bug : change path of ODT template for commande and propal module
 2013-04-10 08:15:57 -07:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
b80d4874e3 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2013-04-10 15:34:51 +02:00
Regis Houssin
057365b69e Fix: change for experimental encryption 2013-04-10 15:33:03 +02:00
Regis Houssin
eb78de1981 Merge pull request #820 from FHenry/3.3 
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
 2013-04-10 06:20:06 -07:00
fhenry
38e30836a5 Fix bug with multicompany (SYSLOG_FILE on wrong entity) 2013-04-10 15:08:03 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
f17ba4814e Merge pull request #816 from FHenry/3.3 
Fix [ bug #810 ] Cannot update ODT template path
 2013-04-08 14:28:51 -07:00
fhenry
98aaec18a7 Fix [ bug #810 ] Cannot update ODT template path 2013-04-08 18:08:38 +02:00
Regis Houssin
f3bbfe375c Fix: for multicompany compatibility 2013-04-08 12:41:48 +02:00
Laurent Destailleur
4ce7a70411 Merge pull request #813 from marcosgdf/3.3 
Removed duplicated code and fixed a problem with orders2invoice
 2013-04-07 14:00:32 -07:00
Laurent Destailleur
19c8336e6e Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-07 22:51:31 +02:00
Marcos García
303cf3bc41 Updated changelog 2013-04-07 22:01:33 +02:00
Marcos García
6013916d45 Removed duplicated code and fixed a problem with orders2invoice 2013-04-07 21:58:24 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Juanjo Menent
29124649bd Merge pull request #810 from simnandez/3.3 
Update ChangeLog
 2013-04-07 07:09:10 -07:00
simnandez
8f67606685 Spelling fix 2013-04-07 16:04:57 +02:00
simnandez
35279f6520 Update ChangeLog 2013-04-07 15:17:31 +02:00
simnandez
515c5e58ca Update Changelog 2013-04-07 15:04:55 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:41:42 +02:00
Laurent Destailleur
4ceeea4a1c Fix: Can't reset payment due date 2013-04-07 14:41:08 +02:00
Laurent Destailleur
56f48245f1 Merge pull request #809 from marcosgdf/3.3 
Improved translations and BILL_SUPPLIER_BUILDDOC trigger
 2013-04-07 05:00:18 -07:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
c10f2dd327 Merge pull request #807 from FHenry/3.3_bug794 
Fix [ bug #794 ] Lost filter on zipwode in prospect list
 2013-04-05 13:50:27 -07:00
Laurent Destailleur
bbb0854517 Merge pull request #803 from FHenry/3.3 
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
 2013-04-05 13:49:11 -07:00
Laurent Destailleur
5736cf0144 Merge pull request #801 from simnandez/3.3 
Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated
 2013-04-05 13:47:43 -07:00
fhenry
09d1e56ca5 Fix [ bug #794 ] Lost filter on zipwode in prospect list 2013-04-05 13:01:15 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
fhenry
ef5c03fc99 Fix[ bug #774 ] Bug on creating event with box "all day" crossed 2013-04-04 19:57:16 +02:00
Simnandez
992ec308d2 Update Changelog 2013-04-04 16:54:41 +02:00
juanjo
61b28274f7 [ bug #790 ] Spanish localtax RE not being correctly calculated 2013-04-04 16:32:06 +02:00
Laurent Destailleur
5af232d936 Merge pull request #797 from FHenry/3.3 
Check style
 2013-04-04 02:40:00 -07:00
fhenry
be01297403 Fix Ducth (nl_NL) translation 2013-04-03 11:56:54 +02:00
fhenry
9572eebae0 Check style 
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
 2013-04-02 22:22:57 +02:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Regis Houssin
1e3b26a104 Fix: file with a specific mask not found, again 2013-03-29 11:54:22 +01:00
Regis Houssin
888da9f3e9 Fix: file with a specific mask not found 2013-03-29 11:52:18 +01:00
Laurent Destailleur
3c3c0b456e Fix: _ not allowed into prestashop tags. 2013-03-28 09:59:59 +01:00
Laurent Destailleur
e0bf4faa4c Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-03-27 20:49:30 +01:00
Laurent Destailleur
0108ee2bd8 Fix: Bad name of function 2013-03-27 20:48:57 +01:00
Regis Houssin
c36f52c47a Fix: avoid errors due to BROKEN FEATURES !!! 2013-03-27 11:54:10 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Regis Houssin
4fe94b800b Fix: missing parameter 2013-03-26 17:43:48 +01:00
Regis Houssin
dff74667c2 Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 17:12:00 +01:00
Laurent Destailleur
7f4fd06f19 Merge pull request #761 from cbattarel/3.3 
fix getting buying price when creating automatically an order from a proposal
 2013-03-20 07:31:31 -07:00