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

4047 Commits

Author SHA1 Message Date
Alexis Algoud
e74e70287f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/replenish.php
 2016-05-14 19:14:39 +02:00
Laurent Destailleur
7c3c8f70be Fix not initialized variables 2016-05-08 12:32:18 +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
a41403c594 Merge pull request #5144 from frederic34/patch-7 
select engine for code 128 didn't work
 2016-05-05 22:32:20 +02:00
Laurent Destailleur
7e34581952 Merge pull request #5139 from aspangaro/4.0-p25 
FIX: Accountancy - Chart of accounts are limited on only one country
 2016-05-05 22:27:05 +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
Laurent Destailleur
5040fe46b0 FIX Missing number total of modules 2016-05-05 11:15:53 +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
Laurent Destailleur
46e2ed2810 NEW: All variant of ckeditor config can be tested into the setup page of 
module.
 2016-05-01 20:36:42 +02:00
Frédéric FRANCE
ffd80e3f8f select engine for code 128 didn't work 2016-04-30 18:56:16 +02:00
Laurent Destailleur
97bf91cc5d Show both currency symbol and code 2016-04-30 14:09:00 +02:00
aspangaro
7041a041ce FIX: Accountancy - Chart of accounts are limited on only one country 2016-04-30 06:52:21 +02:00
Laurent Destailleur
19162fc8d5 Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into 
PeartreeG-patch-1

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/resource/element_resource.php
 2016-04-29 18:31:11 +02:00
Laurent Destailleur
466404d968 Fix missing dol_fiche_xxx 2016-04-29 17:58:39 +02:00
Laurent Destailleur
26b4a5a1e0 Merge pull request #4267 from bafbes/patch-12 
allow cherry-pick of a sub-menu by changing its parent identifier
 2016-04-29 17:55:29 +02:00
Juanjo Menent
206dee7106 Merge pull request #5086 from aspangaro/4.0-p23 
NEW: Loan - Add list to select accounting account in admin
 2016-04-29 12:01:44 +02:00
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
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