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

56461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
b8d452596c Fix : Advanced Accountancy module 2016-05-16 16:37:07 +02:00
Maxime Kohlhaas
af8608ab7a Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES 2016-05-16 10:49:43 +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
Alexis Algoud
b3b064d310 FIX hook on group card called but not initialized 2016-05-14 18:58:14 +02:00
BENKE Charlie
a1ce4000e1 NEW : Add list of billed 
Very usefull when we have many rappro
Maybe do the same on other paiement
 2016-05-14 10:14:10 +02:00
BENKE Charlie
0944463805 Add : rappro order list 2016-05-14 10:06:35 +02:00
Juanjo Menent
21b639ef16 Fix issues with entity control 2016-05-14 00:47:46 +02:00
Laurent Destailleur
cba0ef5693 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-05-14 00:44:38 +02:00
Laurent Destailleur
af38d03825 Clean copyright and libs 2016-05-13 23:22:39 +02:00
Laurent Destailleur
d980742b6c Merge pull request #5057 from nka11/restler3.0.0RC6 
Update Restler to 3.0.0RC6
 2016-05-13 23:15:16 +02:00
Laurent Destailleur
2b225c76d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-13 23:13:16 +02:00
Laurent Destailleur
1bba8166f8 FIX #5207 2016-05-13 23:12:53 +02:00
Laurent Destailleur
ae16e6cdca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-13 20:39:44 +02:00
Laurent Destailleur
6a0f16e9aa FIX #5189 2016-05-13 20:39:31 +02:00
Laurent Destailleur
ab27815f21 Merge pull request #5194 from IonAgorria/dolresource-element 
Fix: Dolresource element type
 2016-05-13 20:32:49 +02:00
Laurent Destailleur
7c26f328bb Merge pull request #5190 from atm-ph/fix_3.8_update_ref_fourn_on_supplier_invoice 
Fix update supplier ref on supplier invoice
 2016-05-13 20:29:09 +02:00
Laurent Destailleur
a5e3503598 Merge pull request #5187 from atm-gauthier/3.8_fix_param_fetch_company 
FIX : can't fetch by siret or siren because of first "if"
 2016-05-13 20:28:46 +02:00
Laurent Destailleur
620c8199e5 Merge pull request #5183 from frederic34/patch-7 
Correction for Auguria Menu Accounting Expert
 2016-05-13 20:28:05 +02:00
Laurent Destailleur
82ea686bc0 Merge pull request #5182 from atm-maxime/fix_contract_line_creation 
Fix contract line creation
 2016-05-13 20:26:41 +02:00
Laurent Destailleur
e885fe9f62 Merge pull request #5175 from grandoc/develop 
add column numbering name and fix a lot of issues within members list
 2016-05-13 20:22:47 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00
Laurent Destailleur
8aebc37a5f FIX Error message 2016-05-13 19:55:49 +02:00
philippe grand
45bdcd282a add mobile search within member list 2016-05-13 19:24:55 +02:00
Laurent Destailleur
2308d28c19 FIX Add test code to detect/test autoload conflict 2016-05-13 19:23:56 +02:00
philippe grand
23cae18765 add phone perso search within member list 2016-05-13 19:06:28 +02:00
philippe grand
740b6819c7 add phone pro search within member list 2016-05-13 17:49:16 +02:00
philippe grand
cd801fe1dd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-13 14:51:07 +02:00
Laurent Destailleur
e6a95b2af9 Clean code 2016-05-13 14:28:37 +02:00
Laurent Destailleur
62b96b580a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-13 11:22:59 +02:00
fappels
ee81b9b835 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-05-12 22:13:26 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Laurent Destailleur
55e904bc01 Debug for expert accounting module 2016-05-12 20:45:05 +02:00
Laurent Destailleur
a83a291856 Translation for one char 2016-05-12 19:55:36 +02:00
Laurent Destailleur
2b6029f5d3 FIX Some fix on stock. Condition to view warehouse as column and 
protection against infinite loop
 2016-05-12 19:44:49 +02:00
Florian HENRY
4cbab1cf47 FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH 2016-05-12 16:58:14 +02:00
nka11
7ec8557db9 remove composer.lock 2016-05-11 23:02:30 +02:00
nka11
018ba1e6c6 fix restler version for RC6 2016-05-11 22:38:16 +02:00
nka11
9f4812e69c upgrade reslter for composer 2016-05-11 22:25:04 +02:00
Ion Agorria
9b11907c70 Update existing linked elements to new type 2016-05-11 18:50:25 +02:00
Ion Agorria
788d499bf6 Change resource type to dolresource in class 2016-05-11 18:50:02 +02:00
nka11
c957cfc260 removing String class which cause server Error with php7 2016-05-11 13:22:58 +02:00
Florian HENRY
d3b3e60d82 Fix email template edition 2016-05-10 22:37:30 +02:00
phf
a57e0f5fd3 Fix update supplier ref on supplier invoice 2016-05-10 14:27:24 +02:00
Florian HENRY
1c0bdfcf1e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-10 14:15:22 +02:00
gauthier
84e75eed88 FIX : can't fetch by siret or siren because of first "if" 2016-05-10 09:31:25 +02:00
Frédéric FRANCE
3607f1a296 Correction for Auguria Menu Accounting Expert 
Entry cause blank windows
 2016-05-09 22:15:00 +02:00
Laurent Destailleur
ab6fbb1bca Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-05-09 19:37:58 +02:00
Laurent Destailleur
a8f50283c0 Fix bad translation 2016-05-09 19:37:14 +02:00
Maxime Kohlhaas
6278610d0a Fix contract line creation should take desc even if not displayed on screen 2016-05-09 15:32:21 +02:00