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

47336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jfefe
0d14cb8709 Modify thirdparty delete() method to pass user object as an argument. 2015-05-03 18:44:42 +02:00
Laurent Destailleur
f0b10c14d7 NEW Add a new component to select categories/tags from the main edit 
page of product. The dedicated tab is also removed.
 2015-05-03 15:51:55 +02:00
Laurent Destailleur
984aca28c3 Sync translation 2015-05-03 15:37:15 +02:00
aspangaro
c502dabd76 Merge remote-tracking branch 'Upstream/develop' into develop-ER_project 2015-05-03 14:31:15 +02:00
aspangaro
c6306260c5 Fix: ER Search mode doesn't work 2015-05-03 14:25:37 +02:00
aspangaro
da272c6aac ER Typo 2015-05-03 14:24:20 +02:00
Laurent Destailleur
0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
 2015-05-03 13:00:39 +02:00
Francis Appels
2b32dc4ba8 Apply correct tabulation 2015-05-03 11:51:54 +02:00
Francis Appels
cb75d0778a Fix doc errors 2015-05-03 11:09:33 +02:00
Juanjo Menent
6b9d5be3c2 Merge pull request #2745 from frederic34/patch-9 
Typo
 2015-05-03 11:01:32 +02:00
Juanjo Menent
edbef3d1da Merge pull request #2746 from frederic34/patch-10 
Typo
 2015-05-03 11:01:17 +02:00
Juanjo Menent
3966b6dfde Merge pull request #2747 from aspangaro/develop-accountancy_patch1 
Accountancy - Add key language & prepare journal for expense report
 2015-05-03 11:00:48 +02:00
Juanjo Menent
ea80386152 Merge pull request #2751 from aspangaro/develop-selectmonth 
New: Add option to show long or short (by default) label in select_month()
 2015-05-03 10:58:45 +02:00
Francis Appels
fee4c4e0e2 Fix: add newline at eof 2015-05-03 10:26:12 +02:00
Francis Appels
f9ece24f95 Fix: Member card header/footer text 2015-05-03 10:09:31 +02:00
Francis Appels
ffe7671549 Fix label L7163 X spacing 2015-05-03 10:08:32 +02:00
Francis Appels
f9908c48cb Add datamatrix en qrcode barcodes 2015-05-03 10:07:04 +02:00