Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,188 Commits 36 Branches 189 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

4057 Commits

Author SHA1 Message Date
Laurent Destailleur
0b6bda910b Removed scrutinizer warning 2016-05-29 11:23:32 +02:00
Laurent Destailleur
c653acd4ce Minor fixes 2016-05-27 14:56:59 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
3df464270c Remove useless code 2016-05-22 16:12:42 +02:00
Laurent Destailleur
b86b464931 Merge pull request #5233 from IonAgorria/email-template-hook 
NEW Hook for adding new email templates on list
 2016-05-22 14:25:06 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Ion Agorria
651b1e1d3a Hook for adding new email templates on list 2016-05-21 03:32:36 +02:00
Laurent Destailleur
92e7177bcb Fix New into new 2016-05-17 19:58:29 +02:00
Alexis Algoud
8d0e5479a0 Rename var 2016-05-14 19:22:27 +02:00
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
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