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

51726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b8b84c67a6 Fix bad setting of default actioncode 2016-01-14 14:15:14 +01:00
arnaud
8b2541ebf9 FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules 2016-01-14 14:10:50 +01:00
Laurent Destailleur
fef3bed4ba Fix bad name of var 2016-01-14 13:32:31 +01:00
Laurent Destailleur
7b14b5e115 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-14 13:30:27 +01:00
Laurent Destailleur
23e90974c4 Prepare to split module supplier into supplier_order and 
supplier_invoice
 2016-01-14 13:24:49 +01:00
Laurent Destailleur
ef7061a575 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:49:23 +01:00
Laurent Destailleur
23dd6b8388 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:35:55 +01:00
Laurent Destailleur
ecb4661155 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-14 11:23:11 +01:00
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +01:00
Laurent Destailleur
89fad007b4 Fix constant() need the string name of a constant to return value of 2016-01-14 11:17:47 +01:00
Laurent Destailleur
d98415f9b5 Merge pull request #4413 from hregis/3.8_bug 
Fix: ajax error with multicompany module
 2016-01-14 11:08:16 +01:00
Laurent Destailleur
7b4ebb498e Merge pull request #4415 from fappels/3.9-4409 
Fix #4409 totals not shown in stock/list
 2016-01-14 11:07:47 +01:00
Laurent Destailleur
a8148b8b40 FIX Bug: Delivery order and date are not displayed #4372 2016-01-13 20:56:20 +01:00
Laurent Destailleur
0f5e208127 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-13 20:43:49 +01:00
Laurent Destailleur
13f10d55fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-13 20:42:32 +01:00
Laurent Destailleur
55a056a449 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-13 20:41:47 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372 
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
 2016-01-13 20:41:32 +01:00
fappels
f264b5e451 Revert changes stock/list, moved to PR #4415 2016-01-13 16:43:34 +01:00
fappels
284722ef3c Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 2016-01-13 16:41:34 +01:00
fappels
f150676908 Fix #4409 totals not shown in stock/list 2016-01-13 16:33:51 +01:00
Regis Houssin
3a3ae90a0a Fix: ajax error with multicompany module 2016-01-13 15:44:26 +01:00
Laurent Destailleur
004285c6b4 Merge pull request #4412 from atm-ph/fix_3.8_clone_event 
FIX can't clone event
 2016-01-13 15:10:36 +01:00
Laurent Destailleur
90833e5d0e Merge pull request #4411 from atm-ph/fix_develop_situation_invoice 
FIX invoice situation
 2016-01-13 15:10:16 +01:00
phf
9b682e095f FIX can't clone event 2016-01-13 14:41:32 +01:00
phf
a50a7366cb FIX travis test 2016-01-13 14:04:48 +01:00
Laurent Destailleur
2c24094d60 Fix bad tab on bad home area page 2016-01-13 13:54:11 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +01:00
Laurent Destailleur
9586096f16 More code comment 2016-01-13 13:31:58 +01:00
Laurent Destailleur
d396612a7c NEW: Add a new method for margin calculation. Added margin on "cost 
price" to margin on WAP price and margin on "best supplier price".
 2016-01-13 12:48:59 +01:00
Raphaël Doursenaud
9eff599f97 [Qual] Mysqli: constructor cannot return a value 2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
aeb3935e31 [Qual] Mysqli: escape with the proper method 2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
87762f14b5 [Qual] Mysqli: OOP style 2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
daa3ce3591 [Qual] Mysqli: set charset with recommended method 2016-01-13 11:55:59 +01:00
Laurent Destailleur
7fd2cbea49 Merge pull request #4257 from defrance/patch-91 
add icalname on default event
 2016-01-12 23:41:57 +01:00
Laurent Destailleur
97e96bed87 Merge pull request #4360 from GPCsolutions/develop-morelock 
[Security] Detect lockfile even without configuration
 2016-01-12 23:24:34 +01:00
Laurent Destailleur
947f718329 Merge pull request #4408 from fmarcet/3.7 
FIX: The third dashboard don't consider user permissions
 2016-01-12 23:23:49 +01:00
Laurent Destailleur
93ed7c098b Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour 
FIX pdf_muscadet delivery hour
 2016-01-12 23:21:05 +01:00
Laurent Destailleur
1b1bd73e6b Merge pull request #4404 from frederic34/patch-8 
FIX When doing payment for money back, bank account was not set by default
 2016-01-12 23:20:32 +01:00
Laurent Destailleur
3b60465f7b Merge pull request #4403 from frederic34/patch-7 
Add number of records in expedition list
 2016-01-12 23:19:28 +01:00
Laurent Destailleur
0a255decf8 Merge pull request #4401 from aspangaro/develop-p2 
New: #3292 Make sure each and every page displays a title
 2016-01-12 23:19:17 +01:00
Laurent Destailleur
85747c7383 Merge pull request #4400 from aspangaro/3.8-p1 
Fix: #4394 Untranslated label in list of expense reports
 2016-01-12 23:14:16 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-12 23:10:25 +01:00
Laurent Destailleur
0f53c49673 Merge pull request #4392 from aspangaro/3.9-p5 
Fix: HRM index typo and presentation
 2016-01-12 23:00:06 +01:00
Laurent Destailleur
233dc051a1 Merge pull request #4384 from hregis/3.9_bug 
Fix: Gives the possibility to the module, to provide his own family info
 2016-01-12 22:59:43 +01:00
Laurent Destailleur
cd2695d1f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-12 22:54:32 +01:00
Laurent Destailleur
bf19ae878b Add migration to 4.0 2016-01-12 22:54:20 +01:00
Laurent Destailleur
5b26f456f4 Merge pull request #4356 from GPCsolutions/3.8-4291 
FIX #4291 Correctly filter bank card GETPOSTs
 2016-01-12 22:51:17 +01:00
Laurent Destailleur
64026c41f8 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-12 22:03:34 +01:00