Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
52,021 Commits 36 Branches 189 Tags
71a12824c91cb71c5aeccba3cbba62f448a7566c
Commit Graph

979 Commits

Author SHA1 Message Date
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
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +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
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
Laurent Destailleur
2e1011ca0c Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that 
seems useless.
 2016-02-06 12:29:02 +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
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +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
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
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
d65229998b Work on website module 2016-01-25 10:25:52 +01:00
Laurent Destailleur
8d46a56dac Work on CMS module 2016-01-24 21:17:11 +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
aspangaro
84ff86ab50 Merge remote-tracking branch 'Upstream/develop' into develop-p3 2016-01-21 20:53:42 +01:00
aspangaro
ddc2e8bfbe Fix: Modify length of code journal for accountancy in bank account 2016-01-21 20:52:15 +01:00
Laurent Destailleur
4dc812618a NEW Add index on invoice status 
NEW Add constant MAIN_LOGTOHTML to 0 into other setup by default to save
time when we need to make debug on hosted instance.
 2016-01-21 10:37:43 +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
4a009d2ad2 NEW On translation admin page, admin can overwrite a translation value. 2016-01-16 00:48:14 +01:00
Laurent Destailleur
03eccb3336 Prepare database to be able to manage a different opportunity 
probability for each opportunity.
 2016-01-10 19:48:59 +01:00
Juanjo Menent
66c5d7c9ce Merge pull request #4150 from defrance/patch-84 
Add date start and end of intervention
 2016-01-09 17:56:39 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
bobby
e557c002c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-26 11:56:10 +01:00
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +01:00
Laurent Destailleur
a4edd90320 Debug the cron module 2015-12-19 03:27:55 +01:00
Laurent Destailleur
a973c91c24 Fix pagination on cron jobs 
Fix perf when too much lines
 2015-12-19 02:39:44 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
cla
ef487c48a4 NEW 
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
 2015-12-16 16:18:29 +01:00
aspangaro
5cd5413836 Accountancy add a column in table bookkeeping to validate operations 2015-12-16 05:22:50 +01:00
BENKE Charlie
85344aa955 Update llx_fichinter.sql 2015-12-15 11:46:56 +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
5f4be14dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-12 13:19:55 +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
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Laurent Destailleur
984068c136 Fix length of password too low (password was truncated making them 
inoperent)
 2015-12-06 19:17:39 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
BENKE Charlie
2c95344f05 Add date start and end of intervention 2015-12-04 11:09:05 +01:00
Laurent Destailleur
2f02919c70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-03 10:01:51 +01:00
Laurent Destailleur
c664a492e6 Removed a not used field making mysql error (reserved word). Also this 
field is not required by dolibarr core.
 2015-12-03 10:01:40 +01:00
aspangaro
09a6cc9625 wrong table 2015-12-01 20:17:14 +01:00
aspangaro
882b66c586 HRM - Add bank tab in user to pay salary or expense report 2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00