Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

7572 Commits

Author SHA1 Message Date
Raphaël Doursenaud
2ff0cebbf7 Added missing translation of categories' "Translation" tab 
Fix #2769
 2015-05-05 11:24:04 +02:00
Laurent Destailleur
1e8b148e4b Work on tracking id into emails 2015-05-05 04:10:42 +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
f84ea6f960 Uniformize code of boxes 2015-05-04 13:10:45 +02:00
Laurent Destailleur
e73526b29c Fix prospect box must use the getNomUrl method 2015-05-04 12:42:45 +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
fmarcet
077a9c6510 FIX: Bug on order and supplier invoice numeration mask when use supplier 
code
 2015-05-04 09:22:55 +02:00
jfefe
53f480708f Merge branch 'develop' into api_restler 2015-05-03 23:43:13 +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
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
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
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
jfefe
2ea8c90fe2 Module descriptor for API module 2015-05-03 14:53:40 +02:00
jfefe
46ce77c571 Refactor function to use it into API 
New function checkUserAccessToObject() is a piece of restrictedArea() function.
 2015-05-03 14:41:51 +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
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
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
Francis Appels
96dfdfeb73 New tcpdf barcode label printing class 
New tcpdf barcode label printing class and add parameters to printsheet
for using this class.
Add parameter to modules_xxx.php functions to pass printing templete
class to use
 2015-05-03 10:05:59 +02:00
Francis Appels
701c85620b Extend sticker classes from abstract class 
Extend member and printsheet sticker printer classes from new abstract
commonsticker generator
 2015-05-03 10:00:11 +02:00
Francis Appels
2fd4bf1012 Add commonstickergenerator class 
Common abstract class for sticker printing.
Creates contracts for write_file and addSticker methods
 2015-05-03 09:54:37 +02:00
aspangaro
6dfd125872 Spaces 4 : Stop Shouting ! 2015-05-03 06:25:50 +02:00
aspangaro
7062dc7b2e Spaces 3 : the darkside 2015-05-03 06:20:34 +02:00
aspangaro
3a5f6db571 Spaces 2 : return of the vilains 2015-05-03 06:18:21 +02:00
aspangaro
9aa336e0d0 Spaces !!! 2015-05-03 06:16:28 +02:00
aspangaro
8163563753 New: Add option to show long or short (by default) label in select_month() 2015-05-03 06:12:02 +02:00
aspangaro
315e9239ac Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2 2015-05-02 06:45:53 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
Juanjo Menent
6f6ff6697a Merge pull request #2742 from aspangaro/develop-ER_badge 
New: ER add badge on tab document
 2015-05-01 16:24:47 +02:00
Raphaël Doursenaud
31a8e38d37 Allow exporting projects without a third party 
FIX #2729

Conflicts:
	htdocs/core/modules/modProjet.class.php
 2015-05-01 16:01:57 +02:00
Raphaël Doursenaud
93937fe7f3 Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:58:36 +02:00
aspangaro
b0eee2976c New: ER add badge on tab document 2015-05-01 08:46:37 +02:00
Juanjo Menent
29c9686b8e Merge pull request #2730 from GPCsolutions/dolibarr-2718 
Export task labels
 2015-04-30 21:02:17 +02:00
Juanjo Menent
4a4630a4a3 Merge pull request #2735 from GPCsolutions/dolibarr-2632 
Add sensible default mode to directory creation
 2015-04-30 20:51:37 +02:00
Juanjo Menent
91767edd05 Fixed SQL table reference for members types in export 2015-04-30 20:50:05 +02:00
Raphaël Doursenaud
afc582a369 Fixed SQL table reference for members types in export 
FIX #2712
 2015-04-30 17:20:53 +02:00
Francis Appels
f762d6d7cb Add tcpdfbarcode 
Add modTcpdfbarcode class
Add pdf_label class
pdf_standardlabel extends pdf_label
 2015-04-30 16:41:52 +02:00
Raphaël Doursenaud
2c44aa6742 Add sensible default mode to directory creation 
Fix #2632
 2015-04-30 16:22:01 +02:00
Raphaël Doursenaud
2058d21da9 Export task labels 
FIX #2718
 2015-04-30 11:43:42 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Destailleur
060d8a1a38 FIX Ref/label of product on contract line was not visible, nor into 
page, nor into PDF.
 2015-04-29 19:57:01 +02:00
Laurent Destailleur
f9a428d550 Fixed #2714 2015-04-27 20:25:02 +02:00
Laurent Destailleur
92f2c48475 Fixed #2714 2015-04-27 11:46:08 +02:00