Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 01:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,918 Commits 36 Branches 190 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

49918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
70df553814 Merge pull request #3494 from FHenry/3.6 
3.6
 2015-09-09 17:43:07 +02:00
Juanjo Menent
42ac326f07 Merge pull request #3477 from aspangaro/develop-64 
New Accountancy Uniformize code & rename a constant
 2015-09-09 17:38:12 +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
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
Laurent Destailleur
3c91b8c890 Force to select "use personalized value" to select a personalized screen 
option.
 2015-09-09 12:39:06 +02:00
philippe grand
79d63e0316 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-09-09 10:13:07 +02:00
Juanjo Menent
d0c2131b09 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-08 21:32:37 +02:00
Juanjo Menent
7d88405058 Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 21:31:04 +02:00
aspangaro
393d528be7 Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-08 21:17:54 +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
Juanjo Menent
4b031e9e6a Merge pull request #3473 from aspangaro/develop-63 
New: Accountancy rename llx_accountingaccount in llx_accounting_account
 2015-09-08 20:06:00 +02:00
Juanjo Menent
45a94b055a Merge pull request #3488 from GPCsolutions/transifex 
Qual: Fixed translation strings
 2015-09-08 19:55:56 +02:00
Juanjo Menent
0c447d7497 Merge pull request #3487 from GPCsolutions/unused 
Qual: removed unused translation token
 2015-09-08 19:55:08 +02:00
Juanjo Menent
5d401f275c Merge pull request #3486 from GPCsolutions/debug 
Qual: remove debug output
 2015-09-08 19:54:42 +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
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/memory.lib.php
 2015-09-08 10:33:33 +02:00
aspangaro
16585553c1 Merge remote-tracking branch 'Upstream/develop' into develop-64 2015-09-07 21:52:08 +02:00
aspangaro
46b0e259b1 Add constant in modAccounting.class.php 2015-09-07 21:51:48 +02:00
aspangaro
cf869f22b5 Merge remote-tracking branch 'Upstream/develop' into develop-63 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-07 21:45:13 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +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
0a6451d72c Fix memcached effect was lost because init was done each time. 2015-09-07 20:17:05 +02:00
Raphaël Doursenaud
e85c510b87 Qual: Fixed translation strings 2015-09-07 19:44:10 +02:00
Raphaël Doursenaud
3624ae0ec7 Qual: removed unused translation token 2015-09-07 19:16:44 +02:00
Raphaël Doursenaud
71b98ffc0e Qual: remove debug output 2015-09-07 17:15:41 +02:00
philippe grand
706f62d8f2 better display for code 2015-09-07 17:02:53 +02:00
Raphaël Doursenaud
92c08c77fd Qual: Don't attempt HTTPS redirect if already using HTTPS 2015-09-07 16:43:17 +02:00
Raphaël Doursenaud
1168f0b6ae Fix regression introduced by f3c71a9a5a 2015-09-07 16:20:17 +02:00
philippe grand
ec21916d3b translations missing 2015-09-07 15:55:26 +02:00
philippe grand
9532baf0e5 translations missing 2015-09-07 15:46:57 +02:00
philippe grand
887a4107a1 translations missing 2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714 translations missing 2015-09-07 15:29:51 +02:00
Laurent Destailleur
53a9c93b90 Fix PHPCS 2015-09-07 15:16:43 +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
5d285bf56d Merge pull request #3478 from grandoc/develop 
translations missing
 2015-09-07 15:09:31 +02:00
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Laurent Destailleur
fc35c4e3f0 Add migration script for 3.9 2015-09-07 14:01:59 +02:00
Laurent Destailleur
2de690259a Add migration script for 3.9 2015-09-07 14:01:05 +02:00
Laurent Destailleur
fe60927503 Fix button must appears if box selected 2015-09-07 13:30:02 +02:00