Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-31 22:22:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,183 Commits 37 Branches 191 Tags
14de1d66c052d21d24cfab8240d2b9707f247e9f
Commit Graph

36277 Commits

Author SHA1 Message Date
Laurent Destailleur
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Laurent Destailleur
02f4016b7b Merge pull request #1693 from aspangaro/3.6 
Fix :: acount_parent must be an int - Final step
 2014-06-29 23:46:49 +02:00
Laurent Destailleur
6fc3111216 Merge pull request #1691 from atm-maxime/3.6 
Fix : Invoice PDF was not showing ref when created from a shipment. Now ...
 2014-06-29 23:44:18 +02:00
Florian HENRY
e8bb5d5cc0 Syntax 2014-06-29 17:43:22 +02:00
Florian HENRY
1857280234 Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if 
not defined for customer
 2014-06-29 17:39:54 +02:00
Laurent Destailleur
198a8d40f7 Fix: Missing translation 2014-06-29 13:53:07 +02:00
aspangaro
25f2fec473 Fix :: acount_parent must be an int - Final step 2014-06-29 07:02:13 +02:00
aspangaro
f6e307480f Merge branch 'Upstream/3.6' 2014-06-29 05:50:48 +02:00
Maxime Kohlhaas
d61e5bae93 Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related 2014-06-28 17:01:52 +02:00
Laurent Destailleur
dd1c5ce3d8 Fix: Missing commit 2014-06-28 15:03:11 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
d903db6a18 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-28 01:54:20 +02:00
Laurent Destailleur
18838ccfa0 Fix: Correct name for thirdparty created from member. 2014-06-28 01:53:56 +02:00
Laurent Destailleur
092d1b725d Merge pull request #1684 from KreizIT/triggers 
FIX #1460, #1461
 2014-06-26 22:59:55 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Raphaël Doursenaud
f5980a1d20 Fix database prefix usage 2014-06-26 15:52:31 +02:00
Laurent Destailleur
2b93380ab0 Syn pt_BR from transifex 2014-06-26 01:51:17 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Laurent Destailleur
1e6e5da925 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:54 +02:00
Laurent Destailleur
018771c0f5 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:21 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Laurent Destailleur
ffd27f2d49 Fix: Translation 
Fix: pgsql pb
 2014-06-25 08:52:57 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
Laurent Destailleur
54f55cf03e Fix: No change if error on trigger 2014-06-24 22:14:45 +02:00
Laurent Destailleur
1db9514fed Fix: When an invoice is replaced with another, amount must not appears 
on total for project
 2014-06-24 22:02:56 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
0c382ef97e Remove failure test on trigger 2014-06-24 10:55:21 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
aspangaro
54a79c2b34 Merge branch 'Upstream/develop' 2014-06-24 05:48:40 +02:00
Laurent Destailleur
a94b78958f Merge pull request #1679 from defrance69/patch-1 
Update entrepot.class.php
 2014-06-23 20:28:53 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
0f267559c6 FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop 2014-06-23 12:28:59 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
75d9e950c2 Fix: Another column visible when it shouldn't (field has been removed 
and is no more updated by dolibarr).
 2014-06-23 10:10:18 +02:00
Laurent Destailleur
dae7f8643b Transifex sync 2014-06-22 23:37:20 +02:00
BENKE Charles
13ce63ce99 replace mvid by $mvid, wrong week-end 2014-06-22 22:59:25 +02:00
Laurent Destailleur
c18d7de7b0 Fix: Use bad var for test 2014-06-22 13:33:31 +02:00
Laurent Destailleur
d22bfa8847 Fix: Cloning must use dol_clone 2014-06-21 18:16:22 +02:00
Laurent Destailleur
0778d38b2c Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:08:32 +02:00
Laurent Destailleur
62b0d8a472 Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:03:01 +02:00
BENKE Charles
3a886dfeb4 Update mouvementstock.class.php 
return mouvement id instead simply "1", i need to store the movement id on my factory modules (to update it at the end of the build process if it's need)
 2014-06-21 17:51:50 +02:00
BENKE Charles
60ac697813 Update main.inc.php 2014-06-21 16:10:13 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
BENKE Charles
7d76458488 Update entrepot.class.php 2014-06-21 11:39:21 +02:00
BENKE Charles
51a2c2f5cb Update entrepot.class.php 
bad element name
 2014-06-21 10:43:47 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Laurent Destailleur
69c518a483 Merge pull request #1677 from guerinaxel/patch-6 
LDAP Authentication faulty
 2014-06-20 17:14:02 +02:00