lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,001 Commits 43 Branches 150 Tags 886 MiB
2fffd2fa6f
Commit Graph

60001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
50044ed21e FIX #6499 2017-03-10 12:45:56 +01:00
Laurent Destailleur
a4b6388ba1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2017-03-10 12:35:33 +01:00
Laurent Destailleur
fd3837e1d5 Merge pull request #6492 from aspangaro/6.0-donation 
NEW Add donations statistics in home statistics
 2017-03-10 12:31:46 +01:00
Laurent Destailleur
6977daf76a Merge pull request #6491 from atm-gauthier/4.0_fix_supplierinvoiceline_fetch 
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line ob…
 2017-03-10 12:31:20 +01:00
Laurent Destailleur
66d30344f9 Merge pull request #6490 from atm-gauthier/4.0_fix_fetch_infos_multicurrency 
FIX : load multicurrency informations on supplier order and bill line…
 2017-03-10 12:30:56 +01:00
Laurent Destailleur
fbb80b54df Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-10 12:23:09 +01:00
Laurent Destailleur
23d99030bf Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-10 12:21:50 +01:00
Laurent Destailleur
bf34543085 FIX #6443 2017-03-10 12:19:50 +01:00
arnaud
a796a321cc Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2017-03-10 12:16:55 +01:00
Laurent Destailleur
e5fc1583c7 Fix No external access without using getUrlContent function. 2017-03-10 12:05:42 +01:00
Laurent Destailleur
6484fb2a38 Merge pull request #6494 from atm-florian/dev_easter_eggs_commit_strip 
new : hidden easter egg to display commitstrip strip on login page
 2017-03-10 11:55:39 +01:00
Laurent Destailleur
4b63834868 Merge pull request #6488 from atm-quentin/develop 
NEW filter checkbox to add draft order  in replenish
 2017-03-10 11:54:44 +01:00
Laurent Destailleur
cbd0444cd0 Merge pull request #6487 from tarrsalah/fix_fourn_restapayer 
Fix the remainder to pay amount (#6486)
 2017-03-10 11:53:58 +01:00
Laurent Destailleur
fda84995e8 If manage zero is set, we must NOT set length. So we can here make a 
shortcut to avoid useless code.
 2017-03-10 11:50:57 +01:00
arnaud
1d31603ad2 Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo 2017-03-10 11:46:59 +01:00
Laurent Destailleur
3dce431da2 Merge pull request #6498 from LordVan/patch-1 
fix typo in Issue tracker URL
 2017-03-10 11:32:17 +01:00
Laurent Destailleur
46eedeafe8 Fix message shown to many times 2017-03-10 11:30:46 +01:00
Laurent Destailleur
80702e4c0a Fix Better HTML5 compliant 2017-03-10 11:22:27 +01:00
Laurent Destailleur
441042b182 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-10 11:13:01 +01:00
Laurent Destailleur
6cd53cb471 Merge pull request #6482 from aspangaro/5.0-27 
Fix : Language & revert a description of the function
 2017-03-10 11:12:42 +01:00
Laurent Destailleur
567639397e Fix Must use tdoverflowmax100 instead of tdoverflow 2017-03-10 10:57:03 +01:00
Laurent Destailleur
b3d27521cb Fix Must use tdoverflowmax100 instead of tdoverflow 2017-03-10 10:55:35 +01:00
Laurent Destailleur
8389db18bf Fix solution for comaptibility 2017-03-10 10:07:09 +01:00
florian HENRY
9b10c9f6d1 FIX : Can use quote into supplier ref on order line add 2017-03-10 09:19:42 +01:00
Laurent Destailleur
e44234a47f NEW add property to show warnings when activating modules 2017-03-09 15:16:45 +01:00
Laurent Destailleur
c962daabac NEW add property to show warnings when activating modules 2017-03-09 15:16:16 +01:00
Laurent Destailleur
d241adc201 NEW Use autocompletion on the "Add widget list". 2017-03-09 13:22:43 +01:00
Thomas Raschbacher
b520c0ab6b fix typo in Issue tracker URL 2017-03-09 08:12:45 +01:00
arnaud
4a7e3fb387 NEW odt usergroup 2017-03-08 11:34:21 +01:00
florian HENRY
76e55fcdb1 NEW :hidden Easter egg to display commitstrip strip on login page 2017-03-08 09:06:38 +01:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Alexandre SPANGARO
fd0a46c5cf New : add donations statistics in home statistics 2017-03-07 22:31:34 +01:00
Alexandre SPANGARO
6ce8aa7d6f Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-03-07 22:08:23 +01:00
Laurent Destailleur
8ac1aab45a Uniformize look and feels 2017-03-07 18:34:57 +01:00
Laurent Destailleur
72606a6fa6 Fix english 2017-03-07 15:46:47 +01:00
gauthier
9eb3975803 FIX : forgotten fk_facture_fourn attribute on supplierinvoice line object 2017-03-07 15:18:20 +01:00
fappels
277f9d3925 Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0 2017-03-07 13:15:21 +01:00
gauthier
b192b6cd50 FIX : multicurrency_subprice 2017-03-07 11:33:18 +01:00
gauthier
6e0589ce2c FIX : load multicurrency informations on supplier order and bill lines fetch 2017-03-07 10:55:17 +01:00
Quentin Vial-Gouteyron
bf8d510541 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-03-06 15:52:59 +01:00
Quentin Vial-Gouteyron
b378279440 New_filter_to_add_draft_order_to_validated_one 2017-03-06 15:50:17 +01:00
florian HENRY
fc63008485 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect 2017-03-06 15:35:29 +01:00
Laurent Destailleur
d38818ff11 Fix option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS not correctly 
supported.
 2017-03-06 13:01:04 +01:00
Laurent Destailleur
c260325863 Lang not loaded 2017-03-06 12:32:07 +01:00
Laurent Destailleur
f291e1c470 Fix test on qty for stock move 2017-03-06 12:30:59 +01:00
florian HENRY
46c329848b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_NEW_copyeventfiles 2017-03-06 11:40:57 +01:00
tarrsalah
bc7f4f3031 No need to recalculate $totalpaye. 2017-03-06 09:02:32 +01:00
Laurent Destailleur
4e4045d18a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
6e2aaf7408 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/list.php
 2017-03-05 22:03:38 +01:00