lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,815 Commits 43 Branches 150 Tags 886 MiB
302109b3fe
Commit Graph

56815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
302109b3fe Loan - Move tab Notes after Files tab 2016-12-08 22:32:10 +01:00
aspangaro
cd4286b302 Loan - Remove field note_private and note_public into view/edit mode. Already present in tab Notes 2016-12-08 22:27:48 +01:00
aspangaro
eef245d23b Expense report - Hidden button to generate files in create mode 2016-12-08 22:17:03 +01:00
aspangaro
0d5c035034 Expense report - Remove filed note_private and note_public in card. Already in tab Notes 2016-12-08 22:12:16 +01:00
Laurent Destailleur
612c7fde5e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-12-08 15:53:36 +01:00
Laurent Destailleur
bc8b2ae331 Update doc 2016-12-08 13:13:46 +01:00
Laurent Destailleur
cdf0707c5a Merge pull request #6090 from aspangaro/5.0-b1 
Fix: Field comments not registered in new member public form & presentation
 2016-12-08 12:47:31 +01:00
Laurent Destailleur
521eb3a520 Prepare 5.0 2016-12-08 12:44:58 +01:00
aspangaro
cd39b1c6f0 Fix: Field comments not registered in new member public form & presentation 2016-12-08 00:12:54 +01:00
Laurent Destailleur
2938e01fdd Fix a delete must be done after a fetch 2016-12-07 19:16:33 +01:00
Laurent Destailleur
49f5ec6b52 Fix bugs reported by scrutinizer 2016-12-07 19:12:25 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
d23604701c Fix responsive 2016-12-07 15:00:20 +01:00
Laurent Destailleur
083aef9b90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-07 14:27:07 +01:00
Laurent Destailleur
1583d0e49f Fix linkof mass action for pdf merge 2016-12-07 14:14:03 +01:00
Laurent Destailleur
3abeee2d7d Code comment 2016-12-07 13:38:53 +01:00
Laurent Destailleur
d0f66e4d80 Merge pull request #6070 from gnovaro/patch-1 
New Improve code style php5/7
 2016-12-07 13:20:05 +01:00
Laurent Destailleur
9efcda6714 Merge pull request #6086 from fappels/develop-work-on-warehouse-status 
New continue work on warehouse status #5115
 2016-12-07 13:06:07 +01:00
Laurent Destailleur
1f75c2b198 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-07 12:42:00 +01:00
Laurent Destailleur
455a9ed4da FIX security in import of files 2016-12-07 12:41:48 +01:00
Laurent Destailleur
f9ef6f52a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
 2016-12-07 12:23:43 +01:00
Laurent Destailleur
6b5ce5c699 Merge pull request #6084 from milamberspace/Fix_ICE_Maroc 
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
 2016-12-07 12:00:03 +01:00
Laurent Destailleur
b6463c52b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:57 +01:00
Laurent Destailleur
c75a00e683 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:41 +01:00
Laurent Destailleur
ad467989bf Merge pull request #6065 from atm-florian/3.9 
FIX : delete contract extrafields on contract deletion
 2016-12-07 11:54:04 +01:00
Laurent Destailleur
93764b7310 Merge pull request #6079 from jfefe/patch-11 
Fix : bad function name in skeletons list
 2016-12-07 11:52:21 +01:00
Laurent Destailleur
03f13e99de Fix regression. Icon was not icon of correct element. 2016-12-07 11:50:08 +01:00
fappels
b8a1bc157e Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-07 11:41:16 +01:00
Laurent Destailleur
ea3e2e4a95 Merge pull request #6082 from bgenere/develop 
Fixed 2 issues for custom module development regarding import and dictionnaries list.
 2016-12-07 11:34:15 +01:00
Laurent Destailleur
af222e3622 Merge pull request #6087 from fappels/Fix-travis 
Fix travis
 2016-12-07 11:26:23 +01:00
fappels
085d44eaba Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-06 20:15:45 +01:00
fappels
bbbc768fa7 Change filter parameter to string with comma seperated values 
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
 2016-12-06 20:07:19 +01:00
Laurent Destailleur
2a8f23e8c5 Fix labels 2016-12-06 15:03:39 +01:00
Laurent Destailleur
db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2016-12-06 14:08:43 +01:00
Laurent Destailleur
cfff6a8cb8 FIX Export of opportunity status must be code, not id. 2016-12-06 14:05:43 +01:00
Laurent Destailleur
017e384f16 FIX Preselected value for extrafield link was not correctly set 2016-12-06 13:10:44 +01:00
Laurent Destailleur
bd0b017571 Missing filters 2016-12-06 12:13:03 +01:00
Laurent Destailleur
0d7ab3301b FIX in export. Error when using a separate extrafields. 2016-12-06 11:52:07 +01:00
fappels
b918d7abc9 fix travis 2016-12-05 19:20:46 +01:00
fappels
7776ae6da4 Fix travis 2016-12-05 19:19:48 +01:00
fappels
c3b43e18d1 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 18:15:08 +01:00
fappels
3ca9664595 Filter stock on warehouse status for replenishment 
Do not show stock of closed warehouse
 2016-12-05 18:14:42 +01:00
fappels
0aacb7ce17 Filter stock on warehouse status for shipping 
Do not show stock of closed and internal warehouse.
 2016-12-05 18:14:03 +01:00
fappels
18478eaa31 Add warehouse status filter to load_stock function 2016-12-05 18:08:09 +01:00
Laurent Destailleur
1a842d8366 Fix translation 2016-12-05 13:45:57 +01:00
Laurent Destailleur
5edf215b74 Add missing api file 2016-12-05 13:32:08 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
0ff21f0bee Fix example 2016-12-05 12:04:22 +01:00
fappels
fbdc0c25e3 Add STATUS_OPEN_INTERNAL to stock change/move pages 2016-12-05 11:42:03 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00