lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,175 Commits 43 Branches 150 Tags 886 MiB
21a83c7e04
Commit Graph

52175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Battarel
ad82135879 FIX: change order date on clone (as everywhere else) 2015-11-05 15:36:13 +01:00
Christophe Battarel
75bcb7e53f fix pmp 2015-11-05 15:32:56 +01:00
Christophe Battarel
f566b38296 FIX pmp 2015-11-05 15:29:51 +01:00
Christophe Battarel
fa088eb6cc FIX bad calculation for stock value 2015-11-05 14:57:58 +01:00
Raphaël Doursenaud
b0cf9bd0be Fix #3864 Really fixed invalid jQuery code 2015-11-05 14:38:11 +01:00
philippe grand
04238da75d Typo 2015-11-05 14:16:13 +01:00
Laurent Destailleur
1927f47eaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-05 13:43:33 +01:00
Laurent Destailleur
d2fa580f5d The code generator can generate a list.php page with all feature 
immediatly working (sort, extrafields, hooks, select fields to show...)
 2015-11-05 13:43:22 +01:00
Marcos García de La Fuente
e64057c276 Removed unnecesary attribute 2015-11-05 13:07:44 +01:00
Juanjo Menent
63d447d1a7 Merge pull request #3893 from fmarcet/3.8 
FIX: Not showing category selector
 2015-11-05 13:06:18 +01:00
Marcos García de La Fuente
6e8a6eca7a Fixed feature malfunction caused by commit a161e6d47a and previous changes 2015-11-05 13:06:14 +01:00
Juanjo Menent
a9aca80f8d Merge pull request #3891 from grandoc/develop 
[Qual] Fix : TODO:translate
 2015-11-05 13:05:52 +01:00
Christophe Battarel
9b797c1831 FIX bad calculation for stock value 2015-11-05 12:49:43 +01:00
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or 
services
 2015-11-05 11:53:45 +01:00
Alexis Algoud
e1ea2215a3 FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch 2015-11-05 11:25:04 +01:00
philippe grand
b9c0cd316f [Qual] Fix : TODO:translate 2015-11-05 11:11:51 +01:00
Alexis Algoud
0543a31920 FIX event's data lost on user assign update 2015-11-05 11:11:03 +01:00
Laurent Destailleur
41ccfc411a Better error message 2015-11-05 10:11:39 +01:00
frederic34
1a374ddd2c Receipt Printer conf and lang 2015-11-05 08:42:03 +01:00
Laurent Destailleur
fa413fea76 FIX #3813 2015-11-05 03:12:57 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place 
Conflicts:
	htdocs/comm/mailing/card.php
 2015-11-05 03:08:15 +01:00
Laurent Destailleur
a612289136 FIX Storing and deleting files on emailing was done at wrong place 2015-11-05 03:02:31 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote 
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
 2015-11-05 02:45:15 +01:00
Laurent Destailleur
7a5a5459cd Merge pull request #3888 from olsesacl/develop-hook-origin 
When you create a "commande" from a "propal" lost $object->origin and  $object->origin_id in hook
 2015-11-05 02:39:22 +01:00
Laurent Destailleur
fb34f25701 Merge pull request #3887 from GPCsolutions/dolibarr-3864 
Fix #3864 Fixed invalid jQuery code
 2015-11-05 02:34:24 +01:00
Laurent Destailleur
14ec86047f Merge pull request #3886 from GPCsolutions/dolibarr-3805 
Fix #3805 Enhanced Facture::is_last_in_cycle()
 2015-11-05 02:33:48 +01:00
Laurent Destailleur
e12c8fea79 Merge pull request #3885 from GPCsolutions/dolibarr-3870 
Fix #3870 Missing translation
 2015-11-05 02:32:48 +01:00
Laurent Destailleur
4bb21fd218 Merge pull request #3884 from FHenry/3.8 
FIX #3880
 2015-11-05 02:32:32 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos 
Escpos Receipt printer
 2015-11-05 02:18:09 +01:00
Laurent Destailleur
bd96d2f5b1 Merge pull request #3869 from atm-alexis/3.9_FIX_hook_for_PDF 
FIX all PDF hook must be in addreplace type
 2015-11-05 02:16:49 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Sergio Sanchis Climent
f6991dd3ec Moving new fields at the end 2015-11-04 23:18:28 +01:00
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
Raphaël Doursenaud
69ac75bef8 Fix #3864 Fixed invalid jQuery code 2015-11-04 22:55:14 +01:00
Sergio Sanchis Climent
eba0fa1b96 When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook 2015-11-04 22:38:45 +01:00
aspangaro
337643e53e Accountancy : Correct errors of display in bank journal 2015-11-04 22:31:24 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
frederic34
ece9f68e0c wip 2015-11-04 20:02:04 +01:00
Raphaël Doursenaud
23a5c303dd Fix #3870 Missing translation 2015-11-04 19:56:12 +01:00
Florian HENRY
876ab4bb59 FIX : #3882 2015-11-04 18:30:09 +01:00
Florian HENRY
c0136daeb5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-04 18:24:22 +01:00
Florian HENRY
d4ee183662 FIX : 3880 2015-11-04 18:21:59 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not 
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
 2015-11-04 17:51:15 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
Laurent Destailleur
497bc91493 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2015-11-04 16:22:09 +01:00
Laurent Destailleur
0b4a1b827a Update demo database 2015-11-04 16:21:44 +01:00
Laurent Destailleur
832afa139a Update skeleton to generate a list page and a card page. 2015-11-04 16:13:50 +01:00
Laurent Destailleur
f15425be52 Include the link "Back to list" on banner of all user tabs. 2015-11-04 15:45:35 +01:00