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

75768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Welters
a90d01da38
Merge pull request #1 from countiy/patch-1 
expensereport layout changed and IBAN added
 2019-03-08 15:41:10 +01:00
Rafael Ingenleuf
bcd3921561 expensereport layout changed and IBAN added 2019-03-08 15:36:09 +01:00
John BOTELLA
03724c7ba4 Fix travis errors 2019-03-08 14:41:47 +01:00
John BOTELLA
ccebb8d1a7 Fix travis errors 2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564 Add user friendly behavior 2019-03-08 14:26:06 +01:00
Laurent Destailleur
6b8c2a1d3b Enhance script to purge data 2019-03-08 14:09:22 +01:00
John BOTELLA
56a40c7de8 Fix sidebar collapse behavior 2019-03-08 14:06:37 +01:00
Laurent Destailleur
f6c52578cc Add README file 2019-03-08 13:34:03 +01:00
markus
1e4ed531b4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-08 11:47:08 +01:00
Laurent Destailleur
1a96a7a88f FIX More complete auto setup of barcode module 
Add tooltip help on member setup module
 2019-03-08 11:31:12 +01:00
Alexandre SPANGARO
d926657534 FIX: Accountancy - Format EBP import 
Add doc
 2019-03-08 10:57:14 +01:00
Alexandre SPANGARO
5d06e53f1b NEW: Accounting - More comprehensive menu 2019-03-08 09:11:56 +01:00
Frédéric FRANCE
e845b96f2b
Update product.class.php 2019-03-07 22:40:16 +01:00
Frédéric FRANCE
3dd4f0bfff
do not trim int 2019-03-07 22:17:48 +01:00
Laurent Destailleur
4c75e6644d Fix css 2019-03-07 21:57:03 +01:00
Frédéric FRANCE
f9e671d8a9
replace html by html5 in fichinter 2019-03-07 21:29:15 +01:00
Laurent Destailleur
ebc2289292 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 20:53:16 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Laurent Destailleur
f82f29737e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 20:46:14 +01:00
Laurent Destailleur
4135e11138
Merge pull request #10774 from frederic34/patch-3 
phpcs fix v9
 2019-03-07 20:46:02 +01:00
Laurent Destailleur
ef56b020e5
Merge pull request #10736 from OPEN-DSI/fix-margin-agents3 
Fix remove "canceled" invoices in margin by user
 2019-03-07 20:45:40 +01:00
Frédéric FRANCE
d02cec9579
phpcs fix v9 2019-03-07 18:13:21 +01:00
John BOTELLA
1127716abf add support for md theme 2019-03-07 17:50:26 +01:00
Frédéric FRANCE
1917adb980
Update stats.class.php 
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
 2019-03-07 17:35:02 +01:00
Laurent Destailleur
d88fc8cf91 Fix bad link 2019-03-07 17:32:10 +01:00
Laurent Destailleur
4ecc1dac56
Merge pull request #10756 from altatof/fp2 
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
 2019-03-07 17:29:10 +01:00
John BOTELLA
218690db00 add css behavior 2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
John BOTELLA
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +01:00
Christophe Battarel
d414e3eb48 add product extrafields 2019-03-07 15:00:48 +01:00
Laurent Destailleur
25fa729e4e NEW Add the now link when creating expense report 2019-03-07 14:32:03 +01:00
Laurent Destailleur
31e1ad48e3 css 2019-03-07 14:28:09 +01:00
Laurent Destailleur
b9408baef3 Fix if price net was not saved, we recalculate it at output 2019-03-07 14:27:20 +01:00
Laurent Destailleur
8d0a8d8263
Merge pull request #10758 from altatof/lf 
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
 2019-03-07 14:18:26 +01:00
Laurent Destailleur
975afd014d
Merge pull request #10763 from frederic34/patch-6 
Update eldy.lib.php
 2019-03-07 14:15:53 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
0729a3b571 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:11:12 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
4f189f4058 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 14:04:11 +01:00
Christophe Battarel
42926404ac Merge https://github.com/Dolibarr/dolibarr into develop 2019-03-07 14:03:49 +01:00
Laurent Destailleur
e96f84a3d6
Merge pull request #10765 from altatof/sd8 
FIX : supplier discount was not retrieved when choosing a product
 2019-03-07 13:26:44 +01:00
Laurent Destailleur
0349f9bfaa
Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00
Laurent Destailleur
a40a08bada
Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid 
Fix default contact id for update and clone actions in event card
 2019-03-07 13:12:22 +01:00
Laurent Destailleur
3757fa83fd
Merge pull request #10760 from altatof/db 
Avoid doing empty queries
 2019-03-07 13:04:46 +01:00
Laurent Destailleur
b93a12bf19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 13:03:06 +01:00
Laurent Destailleur
1fb86e12e5 Merge manually some enhancement from #10507 2019-03-07 13:02:51 +01:00