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

49111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0bfccc7255 Fix print into form to attach file must be into return. 2015-09-12 11:35:56 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
7951483c5f Fix: examples ko for import 
Fix bad picto for export
 2015-09-10 12:47:25 +02:00
Laurent Destailleur
eb4c46ca3d Fix code generator 2015-09-10 12:13:29 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
Laurent Destailleur
f02bd4e756 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-09 12:39:56 +02:00
Juanjo Menent
7d88405058 Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 21:31:04 +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
Laurent Destailleur
10aacb8811 Fix code generator 2015-09-08 20:08:47 +02:00
Florian HENRY
89b723b2a7 FIX : multientity warehouse management 2015-09-08 16:23:00 +02:00
Laurent Destailleur
82ad81fc03 Fix picto 2015-09-07 20:56:28 +02:00
Laurent Destailleur
5529ef7a50 Better doc 2015-09-07 20:53:16 +02:00
Laurent Destailleur
9667b6a7c6 Solve conflict of var name 2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc Fix memcached effect was lost because init was done each time. 2015-09-07 20:19:37 +02:00
Laurent Destailleur
3ae19375cd Merge pull request #3474 from aspangaro/3.8-16 
Fix Problem with checked input when you edit a survey
 2015-09-07 15:11:18 +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
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Laurent Destailleur
822d4d1b39 Fix remove log 2015-09-06 15:06:13 +02:00
Laurent Destailleur
aaa639a3ab Fix error when mark rate is 100% and buying price is 0, no way to 
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
 2015-09-06 15:00:17 +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
e88d7076a6 Fix Problem with checked input when you edit a survey 2015-09-06 07:58:49 +02:00
aspangaro
1756862a65 Typo 2015-09-06 07:56:43 +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
Laurent Destailleur
a21b015cbb Fix XSS 2015-09-05 20:03:02 +02:00
Laurent Destailleur
304a71710e Fix not complete info 2015-09-05 00:57:11 +02:00
Laurent Destailleur
8bea703363 Fix deadlock feature. Can't reconciliate cash bank account. Sometimes 
users need. I introduce a hidden option to fix this quickly.
 2015-09-04 23:23:39 +02:00
Laurent Destailleur
398e9bad94 Add ignore 
Conflicts:
	htdocs/.gitignore
 2015-09-04 23:22:38 +02:00
Juanjo Menent
de3f1b5559 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-09-04 18:23:33 +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
c29f69101c Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/fourn/commande/card.php
 2015-09-04 18:17:44 +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
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +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