Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,188 Commits 36 Branches 190 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

2284 Commits

Author SHA1 Message Date
philippe grand
5f74a0f1c0 Traduction 2015-11-06 09:46:18 +01:00
Laurent Destailleur
2dc644da30 Debug Direct print module using the OAuth setup. 2015-11-06 01:33:49 +01:00
Laurent Destailleur
e4bd99aaf3 Merge pull request #3904 from frederic34/printgcp 
Google Cloud Print
 2015-11-05 21:57:08 +01:00
Laurent Destailleur
a7cea65710 Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement 
NEW add an option to use standard ISO location for bill in crabe model
 2015-11-05 21:51:38 +01:00
Laurent Destailleur
f3b8df3ea5 Merge pull request #3889 from frederic34/escpos 
Receipt Printer conf and lang
 2015-11-05 21:32:43 +01:00
frederic34
3ef6a92bb1 Google Cloud Print 2015-11-05 18:04:00 +01:00
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model 
For electronic sending solutions, it could be required
 2015-11-05 16:17:09 +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
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
11b7d8a44c Merge pull request #3873 from frederic34/escpos 
Escpos Receipt printer
 2015-11-05 02:18:09 +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
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
frederic34
5c725aceb8 sql 2015-11-03 22:12:03 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +01:00
Laurent Destailleur
cd68ea9d0f Fix: We must use external URL for OAuth. 2015-11-02 21:42:11 +01:00
Laurent Destailleur
1bcda200e3 A module to setup OAuth. OK, but what to do once setup of a client 
id/secret is done ?
 2015-11-02 20:48:27 +01:00
Laurent Destailleur
563a020595 NEW Free text for cheque deposit receipt can be HTML content. 2015-11-02 20:35:33 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp 
Printing with Google Cloud Print
 2015-11-02 20:09:13 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
67a2f6ee91 Merge pull request #3854 from fmarcet/3.8 
FIX: Send emails to contacts who should not receive emails
 2015-11-02 18:03:59 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
fmarcet
3c5903f75a FIX: Contacts are not added to the list with the status "no contact" 2015-11-02 11:52:58 +01:00
frederic34
9149032a03 Merge remote branch 'upstream/develop' into printgcp 
Conflicts:
	htdocs/core/actions_printing.inc.php
 2015-11-02 11:43:34 +01:00
aspangaro
6df524bcb0 Remove blank page 2015-11-01 22:54:04 +01:00
frederic34
b9367bb196 Errors management 2015-11-01 11:24:51 +01:00
frederic34
2b4224d4c4 List Jobs 2015-11-01 10:10:14 +01:00
frederic34
2f3e6958f9 Receipt Printer 2015-11-01 00:58:08 +01:00
frederic34
bb06a55844 Work on list jobs 2015-10-31 23:27:10 +01:00
frederic34
b6be372c4b Merge remote branch 'upstream/develop' into printgcp 2015-10-30 18:12:34 +01:00
frederic34
e90f68906e SQL tables for oauth 2015-10-30 17:59:45 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Ferran Marcet
5862037d34 FIX Bad parameters 2015-10-30 13:03:34 +01:00
Laurent Destailleur
87c240252c FIX Can export a field into task time table with export project profile 2015-10-27 22:24:18 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
90a221ef6d Fix version of module 2015-10-22 19:46:30 +02:00
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
aspangaro
8f8de587b8 Add admin & first version to manage establishment 2015-10-10 06:39:59 +02:00
aspangaro
5d7e05e313 Correct review 2015-10-10 06:00:55 +02:00
aspangaro
f6947afc2f Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-10 05:42:06 +02:00
Laurent Destailleur
ab4b423567 Merge pull request #3712 from GPCsolutions/fixunittests 
Fix unittests regression
 2015-10-09 20:19:21 +02:00
Laurent Destailleur
796a87e254 Merge pull request #3673 from apachler/develop 
Changes to ODT creation of proposal and invoice
 2015-10-09 20:18:55 +02:00
Raphaël Doursenaud
b785db86a8 Fix unittests regression 
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
 2015-10-09 19:02:44 +02:00
aspangaro
d9693ba2f2 New : Module HRM 2015-10-09 06:16:43 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Laurent Destailleur
4b103ba8ce Work on a better way to manage modules. All one page. Introduce a way to 
choose order of modules family. We should also be able to introduce
filters.
 2015-10-07 08:13:23 +02:00
Andreas, OE8APR
3aeeab9654 Get proposal customer contact 
Added functionality to get proposal customer contact as contact_xx tags
 2015-10-05 17:51:26 +02:00
Andreas, OE8APR
e3bdc8aaaa Get invoice customer contact 
Added functionality to get invoice customer contact as contact_xx tags
 2015-10-05 17:50:56 +02:00
Laurent Destailleur
85a5b0fc69 Merge pull request #3652 from grandoc/develop 
FIX : typo
 2015-10-04 19:57:12 +02:00