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

2510 Commits

Author SHA1 Message Date
BENKE Charlie
2f36611cad Update export_csv.modules.php 2016-06-04 19:22:15 +02:00
phf
c62a69ccc8 Merge branch 'fix_3.7_issue_2858' into develop 2016-06-04 18:54:55 +02:00
phf
3cbbdf5e20 Fix #2858 2016-06-04 18:23:22 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +02:00
Maxime Kohlhaas
857454a28d For each module, no default permission on activation 2016-06-04 12:16:30 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
BENKE Charlie
2a8f17bc40 Update export_csv.modules.php 2016-06-03 23:58:37 +02:00
BENKE Charlie
41856a920e if \n or \r we addquote too 2016-06-03 23:41:32 +02:00
Laurent Destailleur
537c9637f6 Merge pull request #5255 from atm-florian/dev_fix5151 
FIX: #5151
 2016-06-02 10:05:02 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Florian HENRY
ed05321438 comment don't need to be updated 2016-05-31 23:24:35 +02:00
Florian HENRY
3c42a32690 FIX: #5151 2016-05-31 23:22:15 +02:00
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All 
events" (instead of no filtering)
 2016-05-30 18:12:27 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
b1bd6b5d6e Fix regression 2016-05-18 18:23:38 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
f3cd4b3ee8 Fix doxygen 2016-05-18 14:43:56 +02:00
florian HENRY
4e98f57385 FIX : php strict warning 2016-05-17 09:02:22 +02:00
Laurent Destailleur
55e904bc01 Debug for expert accounting module 2016-05-12 20:45:05 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Laurent Destailleur
aa55cdadac Merge pull request #4944 from FHenry/develop_advtargetemailiing 
NEW : Advance target emailing
 2016-05-05 23:18:27 +02:00
Laurent Destailleur
816dda5a8b Merge pull request #5158 from aspangaro/4.0-p29 
FIX: Accountancy - Little fix et add page to assign massively the category
 2016-05-05 22:52:20 +02:00
Laurent Destailleur
d50e9cde34 Merge pull request #5090 from atm-maxime/fix_pdffoot_details 
PDF foot details
 2016-05-05 21:09:46 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-05-02 20:40:42 +02:00
aspangaro
7749425468 Modify right to access on chart of accounts 2016-05-02 20:02:45 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of 
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
 2016-05-01 16:34:50 +02:00
Laurent Destailleur
b434dad21a Fix: remove a debug code 2016-04-29 18:34:56 +02:00
Laurent Destailleur
cea1c06f7d Merge pull request #4764 from benlo06/fr_4763 
FR4763 add possibility to export contacts/thirdparty categories
 2016-04-29 18:33:58 +02:00
Sergio Sanchis Climent
61fda99fc5 FIX Bug insert cronjobs in modules, default values 2016-04-29 01:13:10 +02:00
Maxime Kohlhaas
02aa3f5688 Debug double conf 2016-04-24 12:14:03 +02:00
Maxime Kohlhaas
651213123f Oups missing $conf 2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
930b4a9be0 New var name 2016-04-23 17:36:55 +02:00
Maxime Kohlhaas
ad26fb2824 New option to show details in pdf page foot 2016-04-23 17:23:44 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
 2016-04-22 21:02:20 +02:00
Laurent Destailleur
7e047ada2b Merge pull request #5064 from aspangaro/4.0-p21 
FIX: Accountancy - Road to stable version
 2016-04-22 19:21:18 +02:00
Laurent Destailleur
63d04f4f2d Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client 
Fix order creation bug because of ->client
 2016-04-22 19:20:48 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main 
FIX Hang on ->client not defined
 2016-04-22 19:07:32 +02:00
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
78d18185e4 Several css enhancements 2016-04-22 11:11:08 +02:00
Laurent Destailleur
a10d97cce0 NEW Can filter on status employee when building emailing from users 2016-04-22 11:09:31 +02:00
Maxime Kohlhaas
e881701968 Fix pdf generation with thirdparty 2016-04-22 09:46:47 +02:00
aspangaro
24fddaa039 Hidden old functions 2016-04-22 06:58:18 +02:00
Frédéric FRANCE
fd9fb505b9 Update printgcp.modules.php 2016-04-21 07:53:22 +02:00
Frédéric FRANCE
e1d55d280e Update printgcp.modules.php 2016-04-20 22:29:27 +02:00
Fixit Management
c3a5a7aab8 Rollback modification in this file 2016-04-19 12:54:46 +02:00
Fixit Management
ee9f1f32c1 Update conf 2016-04-19 12:43:50 +02:00
Fixit Management
5778ba0bd8 Merge remote-tracking branch 'upstream/develop' into fr_4763 2016-04-19 12:31:05 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Juanjo Menent
b5f7f962cc FIX Travis fails 2016-04-15 16:05:47 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Laurent Destailleur
b60e90a7b7 NEW A module can add, into its import profiles, a sql request to execute 
at end of import. This allow to update dernormalized data after import.
 2016-04-11 18:08:03 +02:00
Laurent Destailleur
3678e05270 Mutualize code by moving getter into parent class. 2016-04-11 16:36:00 +02:00
Laurent Destailleur
03f43d7c55 Removed a TODO by moving detection of line of records of a file to 
import into the import driver.
 2016-04-11 15:19:58 +02:00
Laurent Destailleur
0e7fb80a34 FIX: We should be able to import value '0' 2016-04-11 14:56:42 +02:00
Laurent Destailleur
695cccca1c Import wizard accept both id or ref into imported fields. But if the ref 
is numeric, there is no way to know if it is a ref or id. So i introduct
support of syntax id: or ref: into value of field to import to force
type.
 2016-04-11 14:44:14 +02:00
Laurent Destailleur
b16d9a88d5 Fix regression after renaming vars 2016-04-09 19:03:34 +02:00
Laurent Destailleur
83644dcb93 Fix errors reported by scrutinizer 2016-04-09 15:38:15 +02:00
Laurent Destailleur
f2f672a801 FIX variable outpulang not defined 2016-04-09 15:14:27 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00:00
Laurent Destailleur
f14b03a230 NEW Add more trackable events (create, submit and receive supplier 
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
 2016-04-08 17:07:25 +02:00
Laurent Destailleur
1b04eabf1f Merge log with events tabs 2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-07 20:01:52 +02:00
Raphaël Doursenaud
9d6efde935 Prevent sentry logging error with 3.9 update 
Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.

Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.
 2016-04-07 17:16:42 +02:00
Laurent Destailleur
ee53a8b1a8 NEW Can filter modules on publisher 2016-04-06 16:45:22 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
Laurent Destailleur
f9d7c27bd2 FIX Export must use a left join to not loose lines 2016-04-05 17:17:40 +02:00
Laurent Destailleur
dd87195a07 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93 FIX Damn, where was the project ref ? 2016-04-05 17:11:44 +02:00
Juanjo Menent
10df0e33d4 Merge pull request #4896 from grandoc/3.9 
fix a lot of beug
 2016-04-05 16:49:22 +02:00
Laurent Destailleur
2d102d3132 Bad translation key 2016-04-05 10:24:28 +02:00
Laurent Destailleur
6c87dfafae FIX Bad translation key 2016-04-05 10:12:03 +02:00
Florian HENRY
344a87f970 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-04-04 14:43:17 +02:00
Laurent Destailleur
cab1c0f5cd Merge pull request #4886 from apachler/develop 
Added functionality to get project customer contact as contact_xx tags
 2016-04-04 00:11:19 +02:00
Juanjo Menent
e8b2d6baab NEW #3510 : Working 2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04 NEW #3510 : Working 2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be Merge branch 'develop' into develop_advtargetemailiing 2016-04-03 11:29:17 +02:00
Laurent Destailleur
10f639507f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:54:51 +02:00
Florian HENRY
038b928ea4 fix travis 2016-04-01 17:09:03 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
Laurent Destailleur
a47accb1c3 FIX PMP is deprecated at warehouse level 2016-03-30 18:08:08 +02:00
Andreas Pachler
7eded39e28 Reworked functionality to get project contact as contact_xx tags 2016-03-30 08:34:32 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
philippe grand
b3285996dc fix travis issue from commit 139dc9a7 2016-03-26 12:39:08 +01:00
Laurent Destailleur
aab7575528 FIX Problem when disabling module product or service. They both include 
same boxes, we must not disable box if the other is still active
 2016-03-26 12:28:31 +01:00
philippe grand
08970e67d7 fix a lot of beug 2016-03-25 18:16:58 +01:00
Laurent Destailleur
6aba69c69c Merge pull request #4885 from aspangaro/4.0-p6 
NEW: Move HRM dictionary from module to core dictionaries
 2016-03-25 18:06:57 +01:00
Laurent Destailleur
bb8e53deea Revert "Fix regression" 
This reverts commit 5cd5a3a5fb.
 2016-03-25 15:57:19 +01:00
Laurent Destailleur
88e5616622 Prepare code to be able to download ODT templates 2016-03-25 15:56:50 +01:00
Laurent Destailleur
5cd5a3a5fb Fix regression 2016-03-25 15:56:44 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Andreas Pachler
0d308f74be Added functionality to get project customer contact as contact_xx tags 2016-03-24 09:16:24 +01:00
aspangaro
bec5e5958a NEW: Move HRM dictionary from module to core dictionaries 2016-03-24 06:28:12 +01:00
Juanjo Menent
922c57da76 NEW #3510 : Standardize module 2016-03-23 22:45:04 +01:00
Laurent Destailleur
54ac3c0a7b Fix regression 2016-03-22 17:41:42 +01:00
Laurent Destailleur
95a45e8f87 Prepare code to be able to download ODT templates 2016-03-22 17:35:58 +01:00
Laurent Destailleur
ced1462b75 Fix regression 2016-03-22 16:59:54 +01:00
Laurent Destailleur
4f3f1eda7b FIX Duplicate records into export 2016-03-22 12:55:29 +01:00
Laurent Destailleur
876484dfb5 FIX Duplicate records into export 2016-03-22 12:54:26 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
aspangaro
3c09e67453 Merge remote-tracking branch 'Upstream/develop' into 4.0-p2 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-03-21 20:38:17 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
aspangaro
57ebb7c997 NEW: Move Expense report menu from module to menu files 2016-03-20 07:34:48 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00
Laurent Destailleur
2c4f01859c Merge pull request #4802 from grandoc/3.9 
[fix]: define  to avoid issue with external pdf models
 2016-03-17 23:13:13 +01:00
Laurent Destailleur
aa7eb4935c FIX VAT rate can be negative. Example spain selling to morroco. 2016-03-17 12:18:47 +01:00
Laurent Destailleur
1683609d9a FIX Check of EAN13 barcode when mask was set to use 13 digits instead of 
12
 2016-03-17 12:00:38 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Laurent Destailleur
12bb3932d0 NEW Add filter on a keyword, status and nature into list of modules 2016-03-14 19:40:52 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
e0681d0165 Fix unit not visible if not defined 2016-03-09 23:20:44 +01:00
Florian HENRY
a8e2b49c5b FIX : #4768 2016-03-08 10:22:31 +01:00
Benlo
0166d2ec3a FR4763 add possibility to export contacts/thirdparty categories 2016-03-07 17:49:26 +01:00
Laurent Destailleur
896f60a478 hidden solution to solve files overwriting each other 2016-03-06 00:47:00 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included 
with a . instead of -. This make os think it is part of extension
instead of file name.
 2016-03-06 00:39:13 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Laurent Destailleur
c63ee8ceb5 Debug module supplier proposal 2016-03-04 16:08:51 +01:00
abb
f9162aa444 new:advanced permissions to validate and unvalidate interventions 2016-02-29 19:16:09 +01:00
Laurent Destailleur
16a716ebbc Merge pull request #4655 from defrance/patch-103 
ODT generation : No segment defined in odt file is not an error
 2016-02-26 11:15:34 +01:00
Laurent Destailleur
54034ea852 NEW Add $object in parameter of pdf_build_address so we could include 
hook into the function.
 2016-02-25 18:30:31 +01:00
Laurent Destailleur
8c43276fda FIX Extrafields of shipments was not included into export fields 2016-02-25 15:46:14 +01:00
Laurent Destailleur
b3c3d3aac5 NEW Add total weight and volume on PDF 
NEW Can hide column qty ordered.
 2016-02-25 14:18:32 +01:00
Laurent Destailleur
a95240e33d FIX Some troubles into weight and volume calculation when unit differs. 
NEW Introduce a function showDimensionInBestUnit
 2016-02-25 13:46:38 +01:00
Laurent Destailleur
b0f816a400 NEW Add weight/volume for one product into shipment export 2016-02-25 02:22:40 +01:00
Laurent Destailleur
02c0f52880 NEW Include sales representative into export of thirdparties 2016-02-24 16:56:24 +01:00
Laurent Destailleur
ac6001cec8 Fix do not show warning if account defined 2016-02-23 12:44:46 +01:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
Laurent Destailleur
ef497e2129 Merge pull request #4669 from peckpeck/translation_import 
Add support to product translation imports
 2016-02-22 16:17:19 +01:00
Laurent Destailleur
77cbd885f2 NEW Add minimum stock and desired stock into import/export profiles. 
NEW Add state into thirdparty export fields
 2016-02-22 15:30:27 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
e7e6957073 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7 Fix do not show warning if account defined 2016-02-22 09:27:18 +01:00
Benoît Peccatte
c969b09ef7 Add support to product translation imports 2016-02-21 22:04:47 +01:00
Laurent Destailleur
fb0e74645e Merge pull request #4663 from peckpeck/xlsx_support 
NEW Allow imports from xlsx files
 2016-02-21 19:12:38 +01:00
Benoît Peccatte
5a8d1f1c95 Allow imports from xlsx files 2016-02-21 14:10:19 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
82f57b2ccf Better position for modules 2016-02-19 20:05:25 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
BENKE Charlie
8349446340 No segment defined is not an error 
This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
 2016-02-19 10:59:50 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Laurent Destailleur
0d5f30f627 Merge pull request #4589 from frederic34/patch-8 
Update google_oauthcallback.php
 2016-02-15 00:34:22 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
Laurent Destailleur
51ededc794 Fix duplicate template crabe and crevette. crevette was not updated and 
contains old code compared to crabe. To manage situation invoice with a
PDF, code must be included into crabe (with some test if invoice is a
situation invoice or not to manage if to have different code)
 2016-02-15 00:02:07 +01:00
Laurent Destailleur
4bb980830f Merge pull request #4571 from defrance/patch-99 
Add Good Customers Boxes
 2016-02-14 20:56:22 +01:00
Laurent Destailleur
d973596601 Merge pull request #4587 from frederic34/patch-7 
Update modOauth.class.php
 2016-02-14 12:21:03 +01:00
Laurent Destailleur
ecc338b1eb Clean module 2016-02-13 03:25:20 +01:00
Laurent Destailleur
969314e731 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:32 +01:00
Laurent Destailleur
0d7f67ade5 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-10 23:59:15 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Frédéric FRANCE
c28f977e02 Update printgcp.modules.php 2016-02-09 14:12:34 +01:00
Frédéric FRANCE
51da5ea1f0 Update printgcp.modules.php 2016-02-09 14:07:54 +01:00
Frédéric FRANCE
73041b0be5 Update google_oauthcallback.php 2016-02-09 14:05:05 +01:00
Frédéric FRANCE
5dd016c3bc Update modOauth.class.php 2016-02-08 17:55:29 +01:00
Laurent Destailleur
7445a0f71c Clean code for generating sheet of barcode. Can choose output filename. 2016-02-08 16:42:34 +01:00
Laurent Destailleur
fcf1e20d5b Merge pull request #4578 from frederic34/sticker 
Dictionnary for label sticker and card format
 2016-02-08 14:49:31 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00
philippe grand
a15d03a676 fix : Strict Standards: Only variables should be passed by reference 2016-02-08 10:06:32 +01:00
Laurent Destailleur
ad63d5c48d NEW Move load module to status experimental 2016-02-07 22:47:16 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
frederic34
0d11d94234 Merge remote branch 'upstream/develop' into sticker 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-06 12:12:35 +01:00
frederic34
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
BENKE Charlie
e2afe5460e Update modSociete.class.php 2016-02-05 23:37:31 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +01:00
BENKE Charlie
5498b1cd5a Update modSociete.class.php 2016-02-04 18:06:43 +01:00
BENKE Charlie
f87bfffdd9 add edition feacture on product element 2016-02-04 16:12:00 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
547ffd7fcc Add missing phpunit tests 2016-02-02 17:26:14 +01:00
Laurent Destailleur
d88cd500ce Merge pull request #4547 from bafbes/dev1 
fix:remove project info in standard document model for expense reports when project module is disabled
 2016-02-02 16:41:12 +01:00
Laurent Destailleur
0def82f596 Merge pull request #4543 from aspangaro/develop-export 
New: Add User accountancy code in user export
 2016-02-02 15:32:56 +01:00
abb
3bcfe849a1 fix:remove project info in standard document model for expense reports when project module is disabled 2016-01-31 22:35:09 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
aspangaro
6a12cdc876 New: Add User accountancy code in export 2016-01-31 08:18:47 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00
Laurent Destailleur
19d119d3a4 Debug cron module. 
Task to delete temporary files older than 24 is on by default.
 2016-01-30 02:51:26 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
phf
83f90e2b1f Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/commande/card.php
 2016-01-25 21:50:43 +01:00
phf
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +01:00
Laurent Destailleur
ba833dc412 Work on CMS module 2016-01-24 21:35:41 +01:00
Laurent Destailleur
8d46a56dac Work on CMS module 2016-01-24 21:17:11 +01:00
phf
9376699299 FIX travis missing comment for new param 2016-01-23 16:16:15 +01:00
phf
373225272b FIX reorder the display of currency and rate on propal/order 
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
 2016-01-23 16:01:55 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification 
FIX line refetch incompatible with hook practice
 2016-01-22 04:10:06 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
cc71445b45 Fix: Only one name for one same feature. 2016-01-22 02:41:51 +01:00
Laurent Destailleur
e6653ea14f Merge pull request #4333 from defrance/patch-94 
Parameters harmonization of hook call
 2016-01-22 02:35:21 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
phf
68857499d7 NEW display multicurrency price on azur pdf model 2016-01-21 22:26:51 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
Alexis Algoud
48d674578b FIX line is refetch (and seems useless) unless it was modified by the hook previous calling 2016-01-19 11:54:07 +01:00
Laurent Destailleur
6bccac5691 NEW Add Expense report to approve into workboard 
NEW Selection of boxes is move on top
 2016-01-18 11:35:45 +01:00
Laurent Destailleur
be4f9baac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4 FIX: Sql syntax error in doc_generic_task_odt 2016-01-16 10:20:14 +01:00
arnaud
8b2541ebf9 FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules 2016-01-14 14:10:50 +01:00
Laurent Destailleur
7b14b5e115 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-14 13:30:27 +01:00
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +01:00
Laurent Destailleur
0f5e208127 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-13 20:43:49 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-12 23:10:25 +01:00
phf
f280061a90 FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf 2016-01-12 11:09:47 +01:00
Laurent Destailleur
6684bdce84 Merge pull request #4349 from benlo06/fr_4347 
CLOSE #4347 Add payment label to invoices csv exports
 2016-01-10 11:47:25 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
56af0761ee Merge pull request #4295 from aspangaro/develop-a8 
Accountancy Add a list to select accounting account on donation admin
 2016-01-09 17:46:02 +01:00
Laurent Destailleur
e5d0bc9d57 Fix permission not used 2016-01-09 00:34:15 +01:00
Benlo
4aef3d29c1 FIX 4347 : Add labels in translations and change order 2016-01-08 15:03:46 +01:00
Benlo
00b77bafbe CLOSE #4347 Add payment label to invoices csv exports 
For CSV export, add the possibility to export the column libelle (name of payment)
 2016-01-07 14:20:54 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +01:00
BENKE Charlie
428b10d26b Update doc_generic_supplier_proposal_odt.modules.php 2016-01-06 10:55:37 +01:00
BENKE Charlie
cd2e4a5e1e Update doc_generic_proposal_odt.modules.php 2016-01-06 10:53:11 +01:00
BENKE Charlie
cbb5f522eb Update doc_generic_task_odt.modules.php 2016-01-06 10:39:18 +01:00
BENKE Charlie
e6fd718e51 Update doc_generic_project_odt.modules.php 2016-01-06 10:38:06 +01:00
BENKE Charlie
16d43b169c Update doc_generic_invoice_odt.modules.php 2016-01-06 10:36:34 +01:00
BENKE Charlie
743967a9b3 Update doc_generic_shipment_odt.modules.php 2016-01-06 10:35:43 +01:00
BENKE Charlie
ef597395ba Update doc_generic_order_odt.modules.php 2016-01-06 10:34:55 +01:00
BENKE Charlie
5e9b7f07d6 Update doc_generic_odt.modules.php 2016-01-04 15:09:18 +01:00
BENKE Charlie
7d6eb270b8 Update doc_generic_proposal_odt.modules.php 2016-01-04 15:08:44 +01:00
BENKE Charlie
16770d3d3f Update doc_generic_task_odt.modules.php 2016-01-04 15:08:08 +01:00
BENKE Charlie
0d2a6a9868 Update doc_generic_project_odt.modules.php 2016-01-04 15:07:42 +01:00
BENKE Charlie
522f17e6f9 Update doc_generic_invoice_odt.modules.php 2016-01-04 15:07:17 +01:00
BENKE Charlie
11bef2d044 Update doc_generic_shipment_odt.modules.php 2016-01-04 15:06:50 +01:00
BENKE Charlie
99f3df6128 Update doc_generic_order_odt.modules.php 2016-01-04 15:06:28 +01:00
BENKE Charlie
2f56df4899 Update doc_generic_odt.modules.php 2016-01-04 15:03:05 +01:00
BENKE Charlie
a4d24a04a7 Update doc_generic_proposal_odt.modules.php 2016-01-04 15:00:46 +01:00
BENKE Charlie
b308baaf27 Update doc_generic_task_odt.modules.php 2016-01-04 14:58:57 +01:00
BENKE Charlie
f4953a3a6e Update doc_generic_project_odt.modules.php 2016-01-04 14:55:53 +01:00
BENKE Charlie
e41fe61ab0 Update doc_generic_invoice_odt.modules.php 2016-01-04 14:53:28 +01:00
BENKE Charlie
88912b29d9 Update doc_generic_shipment_odt.modules.php 2016-01-04 14:51:15 +01:00
BENKE Charlie
66834df34c Update doc_generic_order_odt.modules.php 2016-01-04 14:47:47 +01:00
BENKE Charlie
768ef73f49 Parameters harmonization of hook execute call 2016-01-04 14:43:38 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
aspangaro
e0da56bcd0 Accountancy Add a list to select accounting account on donation admin 2015-12-26 05:56:14 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
a973c91c24 Fix pagination on cron jobs 
Fix perf when too much lines
 2015-12-19 02:39:44 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
 2015-12-18 21:03:57 +01:00
Laurent Destailleur
dc8e5f45ae Merge pull request #4254 from grandoc/develop 
[Qual] Uniformize code
 2015-12-18 17:13:22 +01:00
Laurent Destailleur
c328860af0 Merge pull request #4250 from GPCsolutions/dolibarr-4242 
FIX #4242 Allow disabling dashes in documents
 2015-12-18 17:07:00 +01:00
Laurent Destailleur
b10f9d4ca3 Fix: when doing an export of extrafields, we must use different table 
alias for each extrafield table.
 2015-12-17 20:40:33 +01:00
philippe grand
367d9de0b7 fix some translation 2015-12-17 17:12:28 +01:00
Raphaël Doursenaud
4f9ab7da24 FIX #4242 Allow disabling dashes in documents 
3.9 specific fix since document have moved
 2015-12-17 10:39:55 +01:00
Raphaël Doursenaud
7e98cfd5b6 FIX #4242 Allow disabling dashes in documents 
3.8 specific fix for new documents
 2015-12-17 10:33:17 +01:00
Raphaël Doursenaud
02e053acc6 FIX #4242 Allow disabling dashes in documents 
3.7 specific fix since document files have moved
 2015-12-17 10:26:27 +01:00
Raphaël Doursenaud
e6ec797af8 FIX #4242 Allow disabling dashes in documents 2015-12-17 10:21:44 +01:00
Laurent Destailleur
90dbfc4870 Fix: to avoid confusion between amount of payment and amount distributed 
on invoice when a payment is done for several invoices, export of
payment can export both fields.
 2015-12-15 15:52:20 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Laurent Destailleur
2a6fbe3526 Fix debug shipment doc generation (bad position of fields, code 
differences, text size, ...)
 2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4 Fix: text too long 2015-12-12 14:12:53 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Laurent Destailleur
2b149aa514 Merge pull request #4148 from AlainRnet/develop 
Update fraise.modules.php
 2015-12-04 10:31:34 +01:00
AlainRnet
ebc1105b5c Update fraise.modules.php 
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
 2015-12-03 21:09:09 +01:00
Romain DESCHAMPS
94101412e9 Progress column not wide enough for 100% 
Progress column not wide enough for 100%
 2015-11-30 12:20:14 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
aspangaro
9817ce8b20 Merge remote-tracking branch 'Upstream/develop' into develop-skype 2015-11-26 07:12:04 +01:00
Laurent Destailleur
8746ee1310 Merge pull request #4067 from aspangaro/develop-donation 
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
 2015-11-25 23:33:13 +01:00
Laurent Destailleur
9d10533f3d Merge pull request #4066 from aspangaro/develop-hrm 
Fix: Auguria Menu & wrong table in dictionary HRM
 2015-11-25 23:32:36 +01:00
aspangaro
3457a732f5 New: Better integration of skype 2015-11-25 20:19:18 +01:00
Laurent Destailleur
5568ff1c54 Fix bad picto on export 2015-11-25 16:41:40 +01:00
Laurent Destailleur
a1824955f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-23 12:21:02 +01:00
Laurent Destailleur
12358c9721 FIX The import help was not visible on calculated fields 2015-11-23 12:20:43 +01:00
Laurent Destailleur
61b46352b7 Dash line was not visible. 2015-11-23 09:36:34 +01:00
aspangaro
71189248d9 Correct description 2015-11-22 21:35:19 +01:00
aspangaro
5bed70b04e New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21 2015-11-22 21:31:05 +01:00
aspangaro
f9e82721d7 Fix: Auguria Menu & wrong table in dictionary HRM 2015-11-22 20:13:48 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
73bcc3bfe3 The temp dir for cache used by rester is correctly managed: No temp or 
data files must be stored outside of documents directory.
 2015-11-22 17:39:13 +01:00
Laurent Destailleur
296e04022f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-22 17:19:45 +01:00
Laurent Destailleur
99fa751edc Test lib is available 2015-11-22 17:19:20 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
3aa25cd2be Merge pull request #4064 from frederic34/escpos 
Add profile escpos printer
 2015-11-22 17:09:15 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
frederic34
bfd97d5226 Add profile escpos printer 2015-11-22 11:04:27 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
Laurent Destailleur
758b8e1f7e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/boxes/box_project.php
 2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-11-21 12:23:51 +01:00
arnaud
4233d24f4b FIX export with category contact extrafields 2015-11-19 18:01:58 +01:00
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +01:00
aspangaro
258ac45519 Remove obsolete code 2015-11-17 22:14:39 +01:00
aspangaro
a5ca6cb732 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-17 20:34:37 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it 
appears into list of modules.
 2015-11-17 00:58:12 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
aspangaro
0f75d76296 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-13 07:52:44 +01:00
Laurent Destailleur
471bcdd29f Remove hard coded list of permissions. 2015-11-13 02:21:27 +01:00
arnaud
aaa6f00d11 FIX export propal and order with extrafields 2015-11-12 12:37:04 +01:00
aspangaro
30c4f1c896 HRM : language 2015-11-12 07:40:46 +01:00
aspangaro
bedba7ffb7 HRM: add a mode 'employee' for development to show tab 2015-11-12 07:26:51 +01:00
aspangaro
20872498ba HRM: Add a tab for holiday module in employee card 2015-11-12 06:58:26 +01:00
Laurent Destailleur
350ef610e9 Fix beluga pdf for projects. Add missing expense reports. 2015-11-07 12:36:34 +01:00
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