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

53225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fb5497f3d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-19 19:52:37 +02:00
Laurent Destailleur
6d2df1f6ea Merge pull request #5007 from altatof/fichinter_order_by_date 
NEW: fichinter lines ordered by rang AND DATE
 2016-04-19 19:26:57 +02:00
Laurent Destailleur
349c1c2d69 Merge pull request #4999 from fappels/develop 
Fix migration script
 2016-04-19 19:22:37 +02:00
Laurent Destailleur
39c68c302e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-19 19:15:55 +02:00
Laurent Destailleur
08c379ad58 Fix submit photo is no more hidden on smartphone. 2016-04-19 19:15:31 +02:00
Laurent Destailleur
005751f330 Merge pull request #4963 from altatof/add_filter_type_on_turnover_report 
NEW: add product type filter on turnover report
 2016-04-19 19:15:04 +02:00
Laurent Destailleur
da329131bb Merge pull request #4959 from nka11/api_dev 
API Improvements
 2016-04-19 19:13:57 +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
Laurent Destailleur
cb1772b527 Fix too much code removed. We still need JQUERY LAYOUT for ECM module. 2016-04-19 01:45:45 +02:00
Laurent Destailleur
448ca49e28 Fix bad field 2016-04-18 21:10:30 +02:00
Laurent Destailleur
3a807d9cdb Revert a commit. The field was already added. 2016-04-18 21:07:26 +02:00
Laurent Destailleur
a88b3a8cc4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-18 21:02:34 +02:00
Laurent Destailleur
f68f5677bb Start to use the vat code to identify a vat into combo list instead of 
just "rate" and "npr".
 2016-04-18 21:02:14 +02:00
Juanjo Menent
5a87218622 Merge pull request #5034 from aspangaro/4.0-p19 
NEW: Accountancy - Add Result page
 2016-04-18 20:17:27 +02:00
Juanjo Menent
b236612975 Merge pull request #5038 from frederic34/patch-10 
Update 3.9.0-4.0.0.sql
 2016-04-18 20:15:17 +02:00
Juanjo Menent
48407da37b Merge pull request #5039 from frederic34/patch-11 
Update rappro.php
 2016-04-18 20:14:44 +02:00
Juanjo Menent
c743cdafed Merge pull request #5019 from AppChecker/develop 
FIX: comparing instead of assign
 2016-04-18 20:07:32 +02:00
nka11
39948968eb Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev 2016-04-18 19:13:06 +02:00
nka11
4eb1aa59aa fix coding rules 2016-04-18 19:11:28 +02:00
Frédéric FRANCE
18b3b3a31d Update rappro.php 2016-04-18 08:14:02 +02:00
Frédéric FRANCE
c6226e63b7 Update 3.9.0-4.0.0.sql 2016-04-18 08:13:01 +02:00
aspangaro
19b594ee9d Correct travis 2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
appchecker
bc949cafd2 fix: comparing instead of assign 2016-04-16 13:39:55 +03:00
Juanjo Menent
7163ee55f7 Merge pull request #5017 from simnandez/develop 
FIX Travis fails
 2016-04-16 09:34:46 +02:00
Juanjo Menent
a2b680aa5a Merge remote-tracking branch 'upstream/develop' into develop 2016-04-15 18:08:12 +02:00
Juanjo Menent
b7d36da74f Merge pull request #5006 from atm-maxime/new_banklink_withdraw 
New add link to widthdraw slip card on bank transaction
 2016-04-15 18:07:33 +02:00
Juanjo Menent
f86952dfaa FIX Add missing field fk_shipping_method_id 2016-04-15 16:57:11 +02:00
Juanjo Menent
b5f7f962cc FIX Travis fails 2016-04-15 16:05:47 +02:00
Juanjo Menent
bff1ec2d80 Merge remote-tracking branch 'upstream/3.9' into develop 2016-04-15 13:49:59 +02:00
Juanjo Menent
8751f6cfa0 Merge pull request #4998 from FHenry/3.9 
FIX Hook resprint  must be printed
 2016-04-15 13:05:40 +02:00
Christophe Battarel
1676595b93 NEW: fichinter lines ordered by rang AND DATE 2016-04-14 10:50:32 +02:00
Maxime Kohlhaas
9de6d31c87 New add link to widthdraw slip card on bank transaction 2016-04-13 15:57:46 +02:00
Laurent Destailleur
e1d35c2797 Fix waarnings 2016-04-12 19:29:32 +02:00
Laurent Destailleur
87702f89fc Work on website module 2016-04-12 19:17:50 +02:00
Laurent Destailleur
df8bbaee34 Add icone for website module 2016-04-12 18:24:35 +02:00
fappels
2462716eb4 Fix migration script 2016-04-12 16:24:00 +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
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +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
56c64f22be Prepare menu icon to hide/show left menu 2016-04-12 13:30:47 +02:00
Florian HENRY
872c99afe9 FIX Hook resprint be printed 2016-04-12 11:35:39 +02:00
Christophe Battarel
0dd25a7e70 add new filter in GROUP BY clause 2016-04-12 09:39:48 +02:00
nka11
9ced1dc008 fixing some style and renaming Account to User API 2016-04-11 23:27:43 +02:00
fappels
64f4a6577d Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-04-11 23:03:53 +02:00
nka11
e5a447c148 Adding more line features (PUT, DELETE, POST) 2016-04-11 22:41:35 +02:00