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

47353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b601a87a2a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-06 23:13:52 +02:00
Juanjo Menent
652ff9e67c Commenting function 2015-05-06 23:13:33 +02:00
Laurent Destailleur
3a8cf17f3c NEW Can edit list of prospect status for customers/prospects. Add a new 
entry into dictionary table to manage list fo status.
Removed deprecated files.
 2015-05-06 23:13:07 +02:00
fmarcet
e191fc41a3 FIX: Bug on order and supplier invoice numeration mask when use supplier 
code
 2015-05-06 21:39:06 +02:00
Maxime Kohlhaas
1cb7d284a5 Fix : shipment PDF was not using generation params 
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
 2015-05-06 21:29:58 +02:00
Juanjo Menent
33f98a4433 Merge pull request #2776 from aspangaro/develop-accountancy_patch1 
Accountancy: add a button to purge search criteria on list
 2015-05-06 20:53:46 +02:00
Laurent Destailleur
e6e263d13f Add field to manage reccuring events 2015-05-06 16:44:41 +02:00
Laurent Destailleur
8efe0143f9 FIX Adding 5 more choice link into survey module was not working with 
chrome
 2015-05-06 16:37:04 +02:00
Laurent Destailleur
45f36514ec Add ansible example tools 2015-05-06 16:31:40 +02:00
Laurent Destailleur
db63a9783e More responsive design 2015-05-06 00:29:39 +02:00
aspangaro
10a895f1bd Accountancy: add a button to purge search criteria on list 2015-05-05 22:36:48 +02:00
Laurent Destailleur
4ce4529cd5 Revert "Remove useless variables for common object" 
This reverts commit 82682dfc66.
 2015-05-05 22:09:58 +02:00
Laurent Destailleur
a4675010ac Fix label 2015-05-05 22:08:53 +02:00
Laurent Destailleur
0410f29e81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-05 21:59:06 +02:00
Laurent Destailleur
b0baed83fc Prepare for email tracking 2015-05-05 21:50:48 +02:00
Juanjo Menent
dc01de8072 Merge pull request #2765 from aternatik/common_properties 
Remove useless variables for common object
 2015-05-05 20:27:52 +02:00
Juanjo Menent
f6d2320c34 Merge pull request #2756 from aternatik/fix_label_product 
FIX : remove deprecated property 'libelle' on product object
 2015-05-05 20:25:08 +02:00
Juanjo Menent
65d736cb68 Merge pull request #2766 from aternatik/fix_product_cat 
Fix : missing link to category into product card.
 2015-05-05 20:17:17 +02:00
Juanjo Menent
75fe8af5dc Merge pull request #2770 from GPCsolutions/dolibarr-2769 
Added missing translation of categories' "Translation" tab
 2015-05-05 20:04:13 +02:00
Laurent Destailleur
f97d81701b Add an exit to avoid to have apache hangs. 2015-05-05 13:46:28 +02:00
Laurent Destailleur
c665bfa3ee Fix error into export filter step 2015-05-05 12:39:27 +02:00
Raphaël Doursenaud
2ff0cebbf7 Added missing translation of categories' "Translation" tab 
Fix #2769
 2015-05-05 11:24:04 +02:00
Laurent Destailleur
409e74facd Missing translation 2015-05-05 11:10:13 +02:00
Laurent Destailleur
4d34f473f6 Won another space line 2015-05-05 11:07:28 +02:00
Laurent Destailleur
896d95cf1c Add doc to build when ony changelog change 2015-05-05 10:23:47 +02:00
Laurent Destailleur
1e8b148e4b Work on tracking id into emails 2015-05-05 04:10:42 +02:00
jfefe
e698c3b64a Fix into category edit page 
Rename $nom into $label
Add missing html class to show description as required
 2015-05-05 01:43:39 +02:00
jfefe
3d8f692355 Fix : missing link to category into product card. 2015-05-05 01:34:50 +02:00
jfefe
82682dfc66 Remove useless variables for common object 
Fields name / civility / ... are nonsense for a lot of objects into Dolibarr.
They could be defined for each object instead of into the common object class.
This for the API which exposes a property civility for a category :\
 2015-05-05 01:13:49 +02:00
Laurent Destailleur
c89c89c73e Mutualise code and some fixes for stock management. 2015-05-04 22:02:54 +02:00
Laurent Destailleur
47e99d82a4 Fix css 2015-05-04 13:36:33 +02:00
Laurent Destailleur
f84ea6f960 Uniformize code of boxes 2015-05-04 13:10:45 +02:00
jfefe
a1cc47f81b Missing rename product field libelle into label 2015-05-04 12:58:54 +02:00
Laurent Destailleur
e73526b29c Fix prospect box must use the getNomUrl method 2015-05-04 12:42:45 +02:00
jfefe
3a1b7d6530 Missing renaming fields 2015-05-04 12:37:50 +02:00
Laurent Destailleur
90f78429ec Fix regression after renaming field fk_soc 2015-05-04 12:29:26 +02:00
Laurent Destailleur
4f4ebfaed3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/printipp/admin/printipp.php
 2015-05-04 12:09:39 +02:00
Laurent Destailleur
a18e3c7813 Fix correct id of core modules 2015-05-04 12:02:09 +02:00
Laurent Destailleur
ac4bd7d441 Uniformize code 2015-05-04 11:41:30 +02:00
Laurent Destailleur
b554d81314 Better translation 2015-05-04 10:47:26 +02:00
Laurent Destailleur
89c9996b22 Fix translation of status 2015-05-04 09:50:49 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Laurent Destailleur
877511717b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-03 21:35:09 +02:00
Laurent Destailleur
0ba2ae6d32 Some fix in css 2015-05-03 21:31:09 +02:00
Laurent Destailleur
4f9af75afa Merge pull request #2723 from ndrosis/patch-17 
hide password
 2015-05-03 21:20:31 +02:00
Laurent Destailleur
8a7728f193 Merge pull request #2752 from fappels/develop-tcpdfbarcode 
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
 2015-05-03 21:19:01 +02:00
Laurent Destailleur
a566ec3ace Merge pull request #2755 from aternatik/company_delete 
Modify thirdparty delete() method to pass user object as an argument.
 2015-05-03 21:18:38 +02:00
Laurent Destailleur
8b85d17a51 Merge pull request #2753 from aspangaro/develop-ER_badge 
Review ER: Add filter on amounts & correct search mode who doesn't work & typo
 2015-05-03 21:17:18 +02:00
Laurent Destailleur
333a29683c uniformize look 2015-05-03 21:15:08 +02:00
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we 
take first entry found.
 2015-05-03 20:07:16 +02:00