lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,010 Commits 43 Branches 150 Tags 886 MiB
cb31ab3e2b
Commit Graph

46010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphaël Doursenaud
cb31ab3e2b FIX Syntax error in Debian Apache configuration 
This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'
 2015-09-16 19:53:32 +02:00
Juanjo Menent
4e19500cce Merge pull request #3527 from FHenry/3.7 
FIX : Must not be able to create Proposal on thridparty with "close" status  #3526
 2015-09-15 15:13:36 +02:00
Florian HENRY
a0fb27bd80 FIX : Can create Proposal on close thridparty #3526 2015-09-15 14:34:49 +02:00
Laurent Destailleur
0c3ebe63c2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/liste.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-12 11:44:07 +02:00
Laurent Destailleur
86b1a9cbce Merge remote-tracking branch 'origin/3.5' into 3.6 2015-09-12 11:38:25 +02:00
Laurent Destailleur
a3032d5674 Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding 
Fix #3471 3.5 Rounding issue when dispatching non-integer
 2015-09-12 11:07:55 +02:00
Laurent Destailleur
a83b3ae7e8 Merge pull request #3503 from fappels/3.7-dispatch-rounding 
Fix #3471 3.7 Rounding issue when dispatching non-integer
 2015-09-12 11:07:16 +02:00
Laurent Destailleur
e1a92c8288 Merge pull request #3506 from atm-maxime/3.6 
Fix multientity stock management (F.Henry followup)
 2015-09-12 10:58:26 +02:00
Maxime Kohlhaas
c6081f0fa2 Fix multientity stock management (F.Henry followup) 2015-09-11 20:38:32 +02:00
fappels
c290840513 Revert "Fix delete not used empty stock record" 
This reverts commit 1d85529eda.
 2015-09-10 23:31:23 +02:00
fappels
75a14e02d8 Fix #3471 3.7 Rounding issue when dispatching non-integer 2015-09-10 23:29:13 +02:00
fappels
8bdfdc0127 Fix #3471 3.5 Rounding issue when dispatching non-integer 2015-09-10 23:12:27 +02:00
fappels
249883dda2 Merge remote-tracking branch 'Dolibarr/3.5' into 3.5 2015-09-10 22:19:41 +02:00
fappels
a294700cef fix dispatch rounding version 1 2015-09-10 22:16:03 +02:00
Juanjo Menent
70df553814 Merge pull request #3494 from FHenry/3.6 
3.6
 2015-09-09 17:43:07 +02:00
Laurent Destailleur
8c1760fbcf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-09-09 13:26:35 +02:00
Laurent Destailleur
d3f1a7d5b8 FIX Bad condition into invoice export request making reporting too many 
rows.
 2015-09-09 13:26:10 +02:00
Juanjo Menent
c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2015-09-08 21:08:59 +02:00
Laurent Destailleur
1f44bb5947 Merge pull request #3495 from FHenry/3.7 
FIX : multientity warehouse management
 2015-09-08 20:58:48 +02:00
Juanjo Menent
355fcc78cf Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 20:48:31 +02:00
Florian HENRY
89b723b2a7 FIX : multientity warehouse management 2015-09-08 16:23:00 +02:00
Florian HENRY
63a817c3a4 Fix wahrehouse multientty management 2015-09-08 16:13:15 +02:00
Florian HENRY
52cb9581ff Fix multientity stock management 2015-09-08 16:00:13 +02:00
Laurent Destailleur
e5ad14442a Merge pull request #3472 from aspangaro/3.7-5 
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
 2015-09-07 15:10:20 +02:00
Florian HENRY
7505537a3e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-09-07 11:39:00 +02:00
Laurent Destailleur
6c78b930d1 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-09-06 11:26:20 +02:00
aspangaro
a4a72d64c0 New: Accountancy Add message when general ledger is witten 2015-09-06 06:43:40 +02:00
aspangaro
b268ccf064 Fix #3455 In advanced accounting module, button transfer to general ledger don't work 2015-09-06 04:52:03 +02:00
Laurent Destailleur
8076ea85ea 3.6.4 was packaged 2015-09-05 20:07:17 +02:00
Juanjo Menent
ecf80249d1 Merge pull request #3454 from hregis/3.7_bug3 
Fix: problem with pagination
 2015-09-04 18:22:23 +02:00
Juanjo Menent
0016f48fac Merge pull request #3424 from atm-aurelien/3.7 
FIX ref_supplier to object property on supplier ref change
 2015-09-04 18:00:05 +02:00
Laurent Destailleur
2e3d25c055 Merge pull request #3462 from grandoc/3.7 
fix : Typo
 2015-09-03 19:15:31 +02:00
Laurent Destailleur
1f25ccf0bf git push origin 3.7Merge branch 'marcosgdf-bug-3460' into 3.7 2015-09-03 19:14:49 +02:00
Laurent Destailleur
c7b7dff0ed Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3460

Conflicts:
	ChangeLog
 2015-09-03 19:14:37 +02:00
Laurent Destailleur
846899dc06 git push origin 3.7Merge branch 'marcosgdf-bug-3383' into 3.7 2015-09-03 19:12:43 +02:00
Laurent Destailleur
54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3383

Conflicts:
	ChangeLog
 2015-09-03 19:12:01 +02:00
Laurent Destailleur
7009c6b890 git push origin 3.7Merge branch 'marcosgdf-bug-3358' into 3.7 2015-09-03 19:08:19 +02:00
Laurent Destailleur
be9d5b030d Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3358

Conflicts:
	ChangeLog
 2015-09-03 19:08:08 +02:00
Laurent Destailleur
b0f604da14 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	ChangeLog
 2015-09-03 17:05:02 +02:00
Laurent Destailleur
de741e41e5 git push origin 3.7Merge branch 'marcosgdf-bug-incorrect-pdf-bank' into 3.7 2015-09-03 17:04:03 +02:00
Laurent Destailleur
bd38e2f0bd Merge pull request #3457 from marcosgdf/bug-iban-whitespaces-37 
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
 2015-09-03 16:56:15 +02:00
Laurent Destailleur
51a01921ba Merge pull request #3456 from marcosgdf/bug-2893 
Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
 2015-09-03 16:55:13 +02:00
philippe grand
fed70b1376 translation missing 2015-09-03 12:57:57 +02:00
Marcos García de La Fuente
ded6e7d6d9 Merge branch '3.7' into bug-3358 
# Conflicts:
#	ChangeLog
 2015-09-03 12:32:03 +02:00
Marcos García de La Fuente
2d5331b8f8 FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice 
Close #3460
 2015-09-03 12:13:03 +02:00
philippe grand
8bf093a7ce fix : Typo 2015-09-03 12:12:10 +02:00
Marcos García de La Fuente
67b7162c59 Merge branch '3.7' into bug-3383 
# Conflicts:
#	ChangeLog
 2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29 Merge branch '3.7' into bug-incorrect-pdf-bank 
# Conflicts:
#	ChangeLog
 2015-09-03 12:03:24 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Marcos García de La Fuente
7a115c9366 Typo 2015-09-03 11:59:46 +02:00