lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,052 Commits 43 Branches 150 Tags 886 MiB
8e7b72d09e
Commit Graph

3231 Commits

Author SHA1 Message Date
Laurent Destailleur
24309a7f17 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-27 12:25:22 +02:00
Laurent Destailleur
3203283fe9 Fix: remove warning 2013-04-27 12:24:48 +02:00
Regis Houssin
c0a3271d76 Fix: bypass the second test if the first is ok 2013-04-26 16:28:54 +02:00
Regis Houssin
c969d17e48 Fix: avoid error 2013-04-26 16:22:14 +02:00
Regis Houssin
36e6269b24 Fix: big security problem with multicompany 2013-04-26 16:08:02 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
unknown
8030b39536 fix : undefined variable 2013-04-19 19:45:06 +02:00
Laurent Destailleur
df0b0ebf51 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-04-19 09:52:25 +02:00
Laurent Destailleur
a5deb8e9d7 Fix: bug into is_erasable function. 
Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-04-16 15:54:36 +02:00
Regis Houssin
9596134e47 Fix: use new method 2013-04-12 10:28:19 +02:00
Regis Houssin
85e09a953f Fix: missing return with hook 2013-04-12 10:04:10 +02:00
Regis Houssin
662d9cfa6e Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:11:15 +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
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +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
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02: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
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
juanjo
61b28274f7 [ bug #790 ] Spanish localtax RE not being correctly calculated 2013-04-04 16:32:06 +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
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
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
Laurent Destailleur
d590aa56eb Merge pull request #749 from simnandez/3.3 
Fix: Bad orders list viewstatut filter if expeditons module is disabled
 2013-03-16 07:39:31 -07:00
Laurent Destailleur
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
simnandez
c0e5cacafc Fix: Bad orders list viewstatut filter if expeditons module is disabled 2013-03-15 16:18:14 +01:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
44698fcde0 Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:53:41 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
fhenry
617a71478b fix [ bug #749 ] 2013-03-05 19:05:12 +01:00
Laurent Destailleur
555b3a1199 Fix:; Removed warning 2013-03-04 21:00:22 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session 
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
 2013-02-28 18:47:38 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00