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

4232 Commits

Author SHA1 Message Date
Juanjo Menent
d6b1cd8a1c Merge pull request #5083 from aspangaro/4.0-p22 
FIX: Accountancy - Work on categories for report - Add french example & other
 2016-04-29 11:59:41 +02:00
Florian HENRY
bfbb1c20bc FIX bug on email template 2016-04-27 09:27:59 +02:00
Alexis Algoud
b46c14812c Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop 2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db NEW decrease stock on expedition closing/classifying 2016-04-25 18:33:39 +02:00
Laurent Destailleur
bcb4b2b607 Work on website module 2016-04-23 21:34:10 +02:00
Maxime Kohlhaas
2c6f58e689 Add choices in PDF admin page 2016-04-23 17:37:12 +02:00
aspangaro
c652d5b02d NEW: Loan - Add list to select accounting account in admin 2016-04-23 16:06:33 +02:00
aspangaro
04fd5a20ef FIX: Accountancy Work on categories for Report - Add french example 2016-04-23 15:43:28 +02:00
Laurent Destailleur
3278c8245b Merge pull request #5020 from frederic34/swiftmailer 
Add Swift Mailer to send mails
 2016-04-22 20:12:58 +02:00
Laurent Destailleur
d40e659b30 Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring 
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
 2016-04-19 19:11:54 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
frederic34
1a552cbd16 typo 2016-04-19 18:27:56 +02:00
frederic34
60ebc6fa11 Some correction for testconnect 2016-04-18 00:47:08 +02:00
frederic34
75127638a4 Embed images 2016-04-17 10:28:21 +02:00
frederic34
567dc1734e Add Swift Mailer to send mails 2016-04-16 18:15:03 +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
fedcad31e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/admin/multicurrency.php
 2016-04-12 14:47:16 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Laurent Destailleur
7ce82aaf16 Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be 
implemented with pure CSS/Jquery so no more need of not maintained
external library.
 2016-04-12 13:38:41 +02:00
Laurent Destailleur
b71c6a8a54 Merge pull request #4800 from atm-ph/new_multicurrency_sync_rates 
New multicurrency sync rates
 2016-04-11 19:20:59 +02:00
Florian HENRY
23bb2eaf8a remove debug 2016-04-11 14:27:17 +02:00
Florian HENRY
b7275edfb8 FIX #4989 2016-04-11 14:24:31 +02:00
Marcos García de La Fuente
a41a80b8fe Merge branch 'develop' into oop-refactor-bankaccount-tostring 2016-04-09 23:17:09 +02:00
phf
a33472942d Fix synchronize rates for multicurrency module 2016-04-09 22:12:33 +02:00
Laurent Destailleur
c2fc9ecf68 Fix scrutinizer warning 2016-04-09 16:12:53 +02:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +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
Laurent Destailleur
2c829e7cb6 NEW Add picto on module list to show warning and if module is an 
external module.
 2016-04-07 11:50:45 +02:00
Laurent Destailleur
ee53a8b1a8 NEW Can filter modules on publisher 2016-04-06 16:45:22 +02:00
Laurent Destailleur
4e3985fbc5 NEW If option to see non stable modules is on, add a filter into module 
list to filter on level (deprecated, experimental, development)
 2016-04-06 13:27:46 +02:00
Laurent Destailleur
a0a31a3c94 Better responsive design for dictionnaries 2016-04-05 11:24:58 +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
Juanjo Menent
b3a5c8bae2 Merge pull request #4937 from simnandez/dolibarr-3510 
Close #3510 Add a numbering module for check deposits
 2016-04-03 16:22:34 +02:00
Juanjo Menent
8f2fb64efb Merge pull request #4929 from aspangaro/4.0-p12 
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
 2016-04-03 16:20:31 +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
e954fc07b3 Use natural_search for sql search forging 2016-04-02 16:30:17 +02:00
Laurent Destailleur
127ceeac8c Uniformize code for list of audit events 2016-04-02 16:12:48 +02:00
Florian HENRY
081c7824d2 FIX : range is MySQL reserved word, cannot be used as column names 2016-04-01 14:00:14 +02:00
Laurent Destailleur
9c394b58b5 Move help text at better place. 2016-04-01 12:40:34 +02:00
aspangaro
e118aad95f Space 2016-04-01 06:48:17 +02:00
aspangaro
620e03337a Merging problem 2016-04-01 06:45:46 +02:00
aspangaro
84d326e036 FIX: Problem with dolibarr installation/migration script. Range is a reserved name. 2016-04-01 06:41:49 +02:00
Laurent Destailleur
b367c9daac Enhance picto for setup 2016-03-30 16:07:48 +02:00
aspangaro
26e017f4ef Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/accountancy/admin/card.php
 2016-03-30 06:05:38 +02:00
Laurent Destailleur
32080e99dd Fix dolistore url 2016-03-29 21:14:12 +02:00
aspangaro
c9271e04a0 Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-03-29 19:54:41 +02:00
Laurent Destailleur
3142fd3d84 Merge pull request #4899 from aspangaro/4.0-p7 
Correct problem of merging with my last commits
 2016-03-29 19:41:50 +02:00
Laurent Destailleur
718e9a7226 Filter on module origin 2016-03-29 19:18:53 +02:00
Laurent Destailleur
4d37c47990 NEW Can select language from combo list on page to overwrite a 
translation
 2016-03-29 18:05:03 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
aspangaro
436fb91901 Uniformize name of table 2016-03-28 14:50:51 +02:00
aspangaro
85d51b0d6f Correct of problem of merging with my last commits 2016-03-28 07:46:55 +02:00
Laurent Destailleur
22bed60a07 Remove manually other PR that should not be validated (travis errors 
reported on PR with serious mysql error in migration due to use of
reserved keyword "range" as a name of a field).
 2016-03-26 11:19:45 +01:00
Laurent Destailleur
6a58b025f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b Uniformise option name 2016-03-25 18:09:42 +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
46fe16be0b Merge pull request #4871 from sbechet/develop 
Postgresql compatibility patch + cosmetic
 2016-03-25 17:57:29 +01:00
Laurent Destailleur
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
aspangaro
05df3408f2 Debug works 2016-03-25 15:59:38 +01:00
aspangaro
1d780e7e77 NEW: Accountancy - Add category to manage the display of the income 
statement and the balance sheet

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-03-25 15:59:31 +01:00
aspangaro
f8f55e05d0 NEW: Accountancy Add a way to initialize chart of accounts 2016-03-25 15:57:54 +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
aspangaro
bec5e5958a NEW: Move HRM dictionary from module to core dictionaries 2016-03-24 06:28:12 +01:00
aspangaro
1712ad04cc Debug works 2016-03-23 22:23:59 +01:00
aspangaro
252f37b363 NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet 2016-03-23 21:36:52 +01:00
Regis Houssin
b38e75c404 Merge branch '3.8_fix_merge' into 3.9_fix_merge 2016-03-23 14:03:35 +01:00
fmarcet
b8bc881e5a FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:57:17 +01:00
fmarcet
84e5c8b437 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:56:06 +01:00
fmarcet
e2b4d39292 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:54:39 +01:00
fmarcet
52d88db5c3 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:53:18 +01:00
aspangaro
923b5930ec NEW: Accountancy Add a way to initialize chart of accounts 2016-03-23 06:05:48 +01:00
Sebastien Bechet
82f74ceb38 Postgresql compatibility patch + cosmetic 2016-03-22 10:09:41 +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
phf
600abc9794 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates 2016-03-20 15:56:54 +01:00
phf
661ee72d55 UPDATE move ajax request in js file and call a new php file to update all rates 2016-03-20 15:17:30 +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
Marcos García de La Fuente
eff5e2ebd7 Replaced old AccountNumber key with BankAccountNumber key 2016-03-19 23:02:09 +01:00
Laurent Destailleur
44dc07a61b Merge pull request #4807 from bafbes/abb-13 
added handle to trigger FICHINTER_ADD_CONTACT in notify module
 2016-03-18 02:40:27 +01:00
Laurent Destailleur
c20124e369 Merge pull request #4829 from jtisseau/starttls 
NEW Sending email can also use the STARTTLS protocol.
 2016-03-18 00:48:13 +01:00
Laurent Destailleur
7528af5569 warning moved into info 2016-03-16 11:18:23 +01:00
jtisseau
a98e19a143 Adds a STARTTLS option 
Adds a STARTTLS authentification option. This is used by Microsoft
Hotmail and Exchange. This commit includes a new constant named
MAIN_MAIL_EMAIL_STARTTLS, a view and edit view for it and the edit
action needed to modify value in DB. It also updates the js function
initFields to make it behave like the standard TLS option and adds two
jQuery function respectively to set TSL off when STARTTLS is selected
and to set STARTTLS off when TLS is selected. Unselecting one of those
won"t select the other.
 2016-03-16 02:09:55 +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
abb
d35f728fad added handle to trigger FICHINTER_ADD_CONTACT in notify module 2016-03-13 19:58:39 +01:00
phf
3134af5013 Fix sync with currencylayer 2016-03-11 23:42:02 +01:00
phf
da17e6e676 New add sync with api to create/update all rates 2016-03-10 23:52:06 +01:00
Laurent Destailleur
d8045e33bb FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to 
edit email templates
 2016-03-05 12:37:09 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Juanjo Menent
852f82e55c Merge pull request #4687 from defrance/patch-106 
NEW add $scandir GETPOST
 2016-02-26 19:52:46 +01:00
Laurent Destailleur
1fa94e4d6a NEW Introduce position of records into dictionnary of type of contacts 2016-02-26 15:03:07 +01:00
BENKE Charlie
8c85f17379 Update supplier_invoice.php 2016-02-26 12:02:53 +01:00
BENKE Charlie
145a87030c Update supplier_order.php 2016-02-26 12:01:55 +01:00
Laurent Destailleur
0f49bb8645 Clean code 2016-02-24 17:09:04 +01:00
Sof
e6d06a67b4 FIX : Fatal error: Class 'FormVentilation' not found 2016-02-23 13:00:52 +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
a08fa814ec Better filter to exclude mysqldump warning 2016-02-22 13:32:01 +01:00
Laurent Destailleur
6181ab4149 FIX Avoid to return an error due to mysql warning 2016-02-22 09:32:42 +01:00
Laurent Destailleur
7765e37101 Better support of option SOCIETE_SORT_ON_TYPEENT 2016-02-19 21:09:36 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
Laurent Destailleur
dbb8460180 Fix avoid false warning 2016-02-19 19:11:31 +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
79bc7cf085 Fix showing description 2016-02-19 04:05:08 +01:00
Laurent Destailleur
761ad0114c Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order 
New add multicurrency on supplier proposal/order
 2016-02-19 03:36:23 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
phf
6d095fce9f Fix replace dol_include_once() function by require_once for internal module 2016-02-16 20:44:23 +01:00
Laurent Destailleur
fad09357f4 NEW Show total number of modules into the module list 2016-02-16 12:54:42 +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
Laurent Destailleur
353fa7c2fc Little cleaning on how options ar shown 2016-02-15 07:12:23 +01:00
Laurent Destailleur
a138c1503a Little cleaning on how options ar shown 2016-02-15 07:04:07 +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
0d5f30f627 Merge pull request #4589 from frederic34/patch-8 
Update google_oauthcallback.php
 2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9 Merge pull request #4603 from GPCsolutions/3.9-4597 
FIX #4597 PHP 7 Uniform Variable Syntax
 2016-02-15 00:32:11 +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
aspangaro
47f60e1f8d Add function img_weather 2016-02-13 07:53:50 +01:00
Laurent Destailleur
ecc338b1eb Clean module 2016-02-13 03:25:20 +01:00
Laurent Destailleur
1c6d154a77 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:11 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
Frédéric FRANCE
ffccd43aab Update oauth.php 2016-02-09 14:08:50 +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
Laurent Destailleur
99c59c8c6b Missing translation 2016-02-07 23:01:21 +01:00
Laurent Destailleur
c1a6a2880b Debug numbering module for customer payment 2016-02-07 14:22:52 +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
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +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
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
1fb1da5be4 Work on website module 2016-02-02 16:24:12 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea Prepare code to match cron rule: 0 if ok, !=0 if error 2016-01-31 14:20:02 +01:00
PeartreeG
581ea0f36b adding resource in contact type list 2016-01-31 12:17:45 +01:00
Laurent Destailleur
eee0037a5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-30 14:32:47 +01:00
Laurent Destailleur
c4d8c20abb Fix missing include 2016-01-30 14:32:20 +01:00
Laurent Destailleur
1854f07e5c Move code to purge files into a dedicated utils class (cron job need 
class)
 2016-01-30 00:12:58 +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
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
Laurent Destailleur
097251ec7f Merge remote-tracking branch 'origin/3.9' into develop 2016-01-23 12:29:22 +01:00
Laurent Destailleur
615ffe5417 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-23 12:28:34 +01:00
Laurent Destailleur
a841db1eeb FIX Purge of temp files was broken 2016-01-23 12:24:46 +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
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
 2016-01-22 03:18:51 +01:00
Laurent Destailleur
d7847a8ec8 Merge pull request #4256 from GPCsolutions/dolibarr-mysqli 
[Qual] mysqli code review
 2016-01-22 02:22:47 +01:00
Laurent Destailleur
e1ac249d18 Increase size of field 2016-01-21 23:28:14 +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
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Laurent Destailleur
2386b79dfc FIX Option to disable meteo was not set correctly in edit mode 2016-01-18 14:49:15 +01:00
Laurent Destailleur
4a009d2ad2 NEW On translation admin page, admin can overwrite a translation value. 2016-01-16 00:48:14 +01:00
Raphaël Doursenaud
daa3ce3591 [Qual] Mysqli: set charset with recommended method 2016-01-13 11:55:59 +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
Regis Houssin
694530bfae Fix: Gives the possibility to the module, to provide his own family info 
and position of this family. (canceled $this->family)
 2016-01-10 13:00:48 +01:00
Laurent Destailleur
7e9ee6f047 Fix include error 2016-01-10 12:51:42 +01:00
Laurent Destailleur
40f0d0c9f2 Merge pull request #4321 from fmarcet/3.7 
FIX: Email templates not compatible with Multicompany
 2016-01-10 11:49:37 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
8cabb87a2b Merge pull request #4299 from aspangaro/develop-a12 
Accountancy Add a list to select accounting account on dict
 2016-01-09 17:47:33 +01:00
Juanjo Menent
7f6f30e69e Merge pull request #4298 from aspangaro/develop-a11 
Accountancy Add a list to select accounting account on tax admin
 2016-01-09 17:47:03 +01:00
Juanjo Menent
099ec2b0fb Merge pull request #4296 from aspangaro/develop-a9 
Accountancy Add a list to select accounting account on salaries admin
 2016-01-09 17:46:24 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a 
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
 2016-01-09 01:18:53 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
127354f0af Minor fixes 2016-01-08 22:41:30 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:45:53 +01:00
Raphaël Doursenaud
f2178f0369 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-08 06:42:28 +01:00
fmarcet
d8360a2a01 FIX: Email templates not compatible with Multicompany 2016-01-07 08:18:36 +01:00
fmarcet
cafe148f72 FIX: Email templates not compatible with Multicompany 2016-01-04 09:12:27 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565 Fix search forms 2016-01-03 18:46:10 +01:00
Laurent Destailleur
d02c261d2e Fix perf test was using a not existing js file. 2016-01-02 18:13:41 +01:00
fmarcet
cebb996120 FIX: Email templates not compatible with Multicompany 2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30 FIX: Email templates not compatible with Multicompany 2015-12-29 10:35:10 +01:00
Bahfir Abbes
61ef9921bd correction of precedent commit 
I do not kow how I deleted a line instead of another.
Sorry for it.
Hope it's resolved
 2015-12-27 17:50:29 +01:00
Laurent Destailleur
e93ec106bc Merge pull request #4290 from defrance/patch-92 
add odt info function call if present in class
 2015-12-27 17:26:26 +01:00
aspangaro
d6b96ec03a Add function length_accountg to dictionary 2015-12-26 08:38:18 +01:00
aspangaro
565040e1bc Accountancy Add a list to select accounting account on dict 2015-12-26 08:19:43 +01:00
aspangaro
f514c65ff7 Modify a style center 2015-12-26 06:41:03 +01:00
aspangaro
86bb93884a Accountancy Add a list to select accounting account on tax admin 2015-12-26 06:35:56 +01:00
aspangaro
97e1bb871e Accountancy Add a list to select accounting account on salaries admin 2015-12-26 06:14:02 +01:00
BENKE Charlie
ed501cec46 add odt info is present in class 2015-12-24 15:44:56 +01:00
BENKE Charlie
9c78b083bd add display odt info if method present in class 2015-12-24 15:42:47 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +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
Bahfir Abbes
4f4c6d904e Update edit.php 
allow cherry-pick of a sub-menu by changing its parent identifier
 2015-12-20 13:37:46 +01:00
Laurent Destailleur
724817b966 Merge pull request #4259 from aschio/develop_sunimport 
Adding extrafields to shipments module
 2015-12-18 17:28:35 +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
98cd4f8307 Fix message so it is more clear what the feature can do or not. 
Fix list of email templates must be hidden for templates of disabled
modules.
 2015-12-18 12:48:20 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
philippe grand
6e45ad92fa fix some issue within setEventMessages attribut 2015-12-17 17:35:30 +01:00
Laurent Destailleur
7b17d2ce0c Merge pull request #4221 from mrsof/patch-1 
FIX : Fatal error: Cannot access empty property
 2015-12-16 19:07:24 +01:00
cla
ef487c48a4 NEW 
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
 2015-12-16 16:18:29 +01:00
Sof
4c60569cc4 FIX : Fatal error: Cannot access empty property 2015-12-14 15:42:21 +01:00
Frédéric FRANCE
65cebe37f3 Update sms.php 2015-12-13 21:12:08 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
BENKE Charlie
898f637457 Update fichinter.php 2015-12-08 18:02:25 +01:00
BENKE Charlie
bcf6c1243c db close must do AFTER llxFooter() call 2015-12-07 11:03:27 +01:00
BENKE Charlie
c60178c95f db close must do AFTER llxFooter() call 2015-12-07 11:00:26 +01:00
BENKE Charlie
771f7183d4 db close must do AFTER llxFooter() call 2015-12-07 10:56:37 +01:00
AlainRnet
50cf96bd16 Update const.php 
link to help file
 2015-12-06 12:01:59 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
6be9a04a56 Fix detection of last version on sourceforge 2015-12-03 14:52:13 +01:00
Laurent Destailleur
e4f0b9ba15 Fix detection of last version on sourceforge 2015-12-03 14:46:34 +01:00
Raphaël Doursenaud
e1d5b4483a Fix #4137 Salaries parameter saving 
Button was outside of the form.
 2015-12-02 18:31:38 +01:00
Laurent Destailleur
3aa25cd2be Merge pull request #4064 from frederic34/escpos 
Add profile escpos printer
 2015-11-22 17:09:15 +01:00
frederic34
6b4b70bdbb translations and help 2015-11-22 14:11:33 +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
611d8f3e86 Merge pull request #4021 from defrance/patch-75 
add odt feature on supplier admin page
 2015-11-21 00:24:15 +01:00
Marcos García de La Fuente
5dba9ef54e FIX #4043 Incorrect translation in error mesage in menu creation admin page 2015-11-20 22:00:11 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
BENKE Charlie
4aad7122e0 add odt feature on supplier admin page 
add odt feature on supplier admin page
 2015-11-17 10:06:03 +01:00
BENKE Charlie
8630a2d56b add odt feature on supplier admin page 
add odt feature on admin page
 2015-11-17 10:04:13 +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
7afedd3f8b Minor enhancement of theme MD 2015-11-15 19:29:18 +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
c2ec4a4fd2 Move online help link at a better place (top right). Link is also always 
visible.
 2015-11-14 22:49:34 +01:00
Laurent Destailleur
6895daa5e9 Fix tr/td not correctly open/closed 
Fix default value was not set
 2015-11-14 19:31:50 +01:00
Laurent Destailleur
80127cbbc9 Fix tr/td not correctly open/closed 
Fix default value was not set
 2015-11-14 19:31:16 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
64c783623b NEW Framework feature. To have a page being loaded at same scrollbar 
level wafter a click on a href link, just add the class "reposition" on
this link.
 2015-11-13 03:35:55 +01:00
Laurent Destailleur
471bcdd29f Remove hard coded list of permissions. 2015-11-13 02:21:27 +01:00
Laurent Destailleur
4065b3f1df Better management of the Dolibarr tracking id into email. 
This will allow an imap scanner to link email
 2015-11-13 00:19:11 +01:00
Laurent Destailleur
e7554d377f Fix better error message 2015-11-06 19:07:05 +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
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
55dfa4859f Install lib with composer 2015-11-05 21:09:14 +01:00
frederic34
8a765bf5fd wip 2015-11-05 16:20:35 +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
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
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
frederic34
ece9f68e0c wip 2015-11-04 20:02:04 +01:00
frederic34
614f9c8e98 wip 2015-11-03 23:26:07 +01:00
frederic34
4a67a94704 wip template edit 2015-11-03 23:11:04 +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
d5b77bdc5f Fix parameters are set at a better place 2015-11-03 19:51:07 +01:00
Laurent Destailleur
12e11da6b4 Use better field 2015-11-02 21:44:52 +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
ffe1284a85 Merge pull request #3840 from frederic34/printgcp 
Printing with Google Cloud Print
 2015-11-02 20:09:13 +01:00
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +01:00
Laurent Destailleur
7b3828b68f Merge pull request #3861 from frederic34/patch-7 
Fix Can't edit DictionaryRevenueStamp
 2015-11-02 20:07:09 +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
Frédéric FRANCE
ccb69d313c Fix Can't edit DictionaryRevenueStamp 2015-11-02 18:18:00 +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
frederic34
0836a84c0e Somme cleaning 2015-10-31 18:06:49 +01:00
Laurent Destailleur
a8d28b5e46 NEW Add a filter field to restrict list of member when doing a LDAP list 
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
 2015-10-30 19:23:23 +01:00
frederic34
b6be372c4b Merge remote branch 'upstream/develop' into printgcp 2015-10-30 18:12:34 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Laurent Destailleur
e01bdebc49 Fix translation 2015-10-30 14:37:19 +01:00
philippe grand
aa6b5bc1ce [Qual] Uniformize code 2015-10-29 13:58:16 +01:00
aspangaro
4e9d06785c Fix #3818 & presentation 2015-10-29 06:47:42 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Juanjo Menent
0bcb9dde10 Merge pull request #3810 from grandoc/develop 
[Qual] Uniformize code
 2015-10-28 16:11:40 +01:00
Laurent Destailleur
fb28586f32 Better visible of what is possible for stock management 2015-10-27 19:18:22 +01:00
philippe grand
12e7c7b9e4 [Qual] Uniformize code 2015-10-27 13:42:00 +01:00
Laurent Destailleur
7d8fab73e1 Merge pull request #3792 from grandoc/develop 
[Qual] Uniformize code
 2015-10-26 23:03:30 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone 
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
 2015-10-26 16:20:09 +01:00
Laurent Destailleur
4b2db78c3a Keep deprecated options to show or not forms for blind people. 2015-10-26 12:50:32 +01:00
Laurent Destailleur
d5e42478a9 Removed deprecated options to show or not forms. Such forms does not 
exists anymore.
 2015-10-26 12:37:36 +01:00
Maxime Kohlhaas
4b7c451f3d Option of standalone creditnote is hidden 2015-10-26 09:43:58 +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
philippe grand
83420880dd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-25 21:07:36 +01:00
Laurent Destailleur
f6d30d8b9e Fix: W3C no form into table 2015-10-23 14:40:45 +02:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
BENKE Charlie
ef79bb3b67 Update dict.php 2015-10-21 05:23:49 +02:00
BENKE Charlie
88ca8d2ace Update dict.php 2015-10-21 05:22:33 +02:00
Laurent Destailleur
9a1ec900bd NEW Add into about page, a sample text to use to promote new version 
release (visible only if version is last stable)
 2015-10-21 00:31:32 +02:00
Frédéric FRANCE
229fa59f6c Update commande.php 2015-10-19 21:57:26 +02:00
Maxime Kohlhaas
a953a66616 New : allow to define list size for object list on customer card 2015-10-19 19:05:04 +02:00
Laurent Destailleur
e43f1cee7b Better error message 2015-10-19 10:52:46 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
aspangaro
aac88519de Merge remote-tracking branch 'Upstream/develop' into develop-hrm 
Conflicts:
	htdocs/user/card.php
 2015-10-17 07:19:46 +02:00
Laurent Destailleur
d27330e012 Removed useless info 2015-10-15 03:38:21 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
Laurent Destailleur
2b17cd3353 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +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