Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

9753 Commits

Author SHA1 Message Date
Alexis Algoud
e74e70287f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/replenish.php
 2016-05-14 19:14:39 +02:00
Laurent Destailleur
cba0ef5693 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-05-14 00:44:38 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Laurent Destailleur
55e904bc01 Debug for expert accounting module 2016-05-12 20:45:05 +02:00
Laurent Destailleur
a83a291856 Translation for one char 2016-05-12 19:55:36 +02:00
Frédéric FRANCE
3607f1a296 Correction for Auguria Menu Accounting Expert 
Entry cause blank windows
 2016-05-09 22:15:00 +02:00
Laurent Destailleur
1032583b02 Better support for accessiblity 2016-05-09 14:59:59 +02:00
Laurent Destailleur
698b93cf1e FIX #5179 2016-05-08 12:38:30 +02:00
Laurent Destailleur
5cf8612c58 Fix scrutinizer errors 2016-05-08 12:08:23 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Laurent Destailleur
1f920bdb55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-07 20:28:29 +02:00
Laurent Destailleur
6bb269381a Merge pull request #5143 from frederic34/morecateg 
categories account like other categories
 2016-05-07 20:25:17 +02:00
Laurent Destailleur
606b7ef666 Revert "fix:erroneous form tag" 
This reverts commit 3093105cd0.
 2016-05-07 20:18:46 +02:00
Laurent Destailleur
fe39b00074 Merge pull request #5172 from bafbes/abb-19 
fix:erroneous form tag
 2016-05-07 20:17:22 +02:00
Laurent Destailleur
5bee176ff8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-07 17:12:43 +02:00
Laurent Destailleur
25dfa0c5b9 Work on website 2016-05-07 16:38:32 +02:00
Juanjo Menent
ae6e233781 Merge pull request #5176 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2016-05-07 00:49:57 +02:00
Laurent Destailleur
d484383467 Minor errors 2016-05-06 22:06:23 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-05-06 19:10:59 +00:00
abb
3093105cd0 fix:erroneous form tag 2016-05-06 11:20:07 +01:00
Laurent Destailleur
5a75f346ff Debug advanced selector 2016-05-06 00:02:22 +02:00
Laurent Destailleur
2960fb6df7 FIX Option not tested everywhere 2016-05-05 23:28:22 +02:00
Laurent Destailleur
aa55cdadac Merge pull request #4944 from FHenry/develop_advtargetemailiing 
NEW : Advance target emailing
 2016-05-05 23:18:27 +02:00
Laurent Destailleur
12cc1ad326 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-05 23:05:31 +02:00
Laurent Destailleur
0c6aaaaa3c FIX #5168 2016-05-05 23:05:17 +02:00
Laurent Destailleur
816dda5a8b Merge pull request #5158 from aspangaro/4.0-p29 
FIX: Accountancy - Little fix et add page to assign massively the category
 2016-05-05 22:52:20 +02:00
Laurent Destailleur
d2df537d43 Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project 
NEW allow a document to be linked to project from another customer
 2016-05-05 22:24:32 +02:00
Laurent Destailleur
d50e9cde34 Merge pull request #5090 from atm-maxime/fix_pdffoot_details 
PDF foot details
 2016-05-05 21:09:46 +02:00
Laurent Destailleur
461f62c200 Use the new global search form 2016-05-05 13:29:42 +02:00
Laurent Destailleur
cbbafb6432 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-04 13:50:17 +02:00
Laurent Destailleur
878ba07fcd NEW The note on time spent can be entered when using the view per day. 2016-05-04 12:24:15 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-05-02 20:40:42 +02:00
Florian HENRY
fda5e6002f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/websites/index.php
 2016-05-02 20:27:34 +02:00
aspangaro
7749425468 Modify right to access on chart of accounts 2016-05-02 20:02:45 +02:00
Laurent Destailleur
df4afdd663 NEW Can disable a module by renaming dir of module into module.disabled 
(this save time for maintenance when working with FTP).
 2016-05-02 09:49:58 +02:00
Laurent Destailleur
5823055cdf Work on website module. 2016-05-01 21:19:29 +02:00
Laurent Destailleur
46e2ed2810 NEW: All variant of ckeditor config can be tested into the setup page of 
module.
 2016-05-01 20:36:42 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of 
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
 2016-05-01 16:34:50 +02:00
Laurent Destailleur
6a123c91b5 Solve warnings that appears because code is using statically a mehtod 
that can't be static yet.
 2016-04-30 19:30:28 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
Laurent Destailleur
f747018fb6 Clean dead code 
FIX when editing price with tax, reset price without so i will be
recalculated.
 2016-04-30 14:24:33 +02:00
Laurent Destailleur
97bf91cc5d Show both currency symbol and code 2016-04-30 14:09:00 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
 2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
 2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c Merge pull request #5101 from altatof/fix_fournprice_select 
FIX: end of select when no fournprice
 2016-04-29 20:36:44 +02:00
BENKE Charlie
31a9acc77d </option> not present in some select list 2016-04-29 20:18:26 +02:00
Laurent Destailleur
db4024035e Merge pull request #5092 from defrance/patch-1 
</option> not present in some select list
 2016-04-29 20:17:56 +02:00
esprit libre
f5a541d469 Fix problem about unit buy price fetching 
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
 2016-04-29 19:41:47 +02:00