Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

4371 Commits

Author SHA1 Message Date
Laurent Destailleur
5cb6b11878 Merge pull request #2007 from aspangaro/develop-search 
Improvement into list & presentation/typo
 2014-11-07 21:47:37 +01:00
Juanjo Menent
3880013940 Fix hooks from supplierorder to supplierinvoice 2014-11-06 23:10:21 +01:00
Juanjo Menent
2f30e769f6 Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown 2014-11-06 22:16:27 +01:00
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
b60f834d8d Improve search into supplier command list 2014-11-06 07:19:16 +01:00
aspangaro
85f0462c20 Suppliers list 2014-11-02 15:16:49 +01:00
aspangaro
1dcb7a58f3 Presentation & fix SQL injection 2014-11-02 14:51:21 +01:00
aspangaro
6109529c6c vat payments list & typo on css class 2014-11-02 14:19:28 +01:00
aspangaro
d6a42bda95 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-02 13:55:57 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
aspangaro
64b9299eb6 Suppliers invoice payment list 2014-11-02 08:45:42 +01:00
aspangaro
e48350fdc1 Unpayed suppliers invoices list 2014-11-02 08:33:39 +01:00
aspangaro
98299f88e8 Suppliers list 2014-11-02 08:12:34 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order 
Added SOAP client for creating a client order in remote webservice
 2014-11-01 21:14:19 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Ion Agorria
557cbaf3d7 Added module descriptor and activation checks 
Corrected 3 missing $error_occurred flags
 2014-10-31 04:59:57 +01:00
Laurent Destailleur
28c0c55780 Merge pull request #1977 from atm-maxime/develop 
Add : statistics on supplier orders and invoices on home page
 2014-10-30 17:59:07 +01:00
Laurent Destailleur
d6c1b71350 Merge pull request #1983 from atm-maxime/mkoevols 
Fixes on extrafields, product supplier prices and user / company association deletion
 2014-10-30 17:49:53 +01:00
Ion Agorria
e875f0c2b8 Fixed missing separator 2014-10-29 05:33:59 +01:00
Ion Agorria
4ff570571e Added SOAP client for creating a client order in remote 
webservice that thirdparty might have.
 2014-10-29 05:13:15 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Maxime Kohlhaas
7b7b7e79e9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 
Conflicts:
	htdocs/core/lib/company.lib.php
 2014-10-27 11:17:44 +01:00
Maxime Kohlhaas
a5739c248e Fix : Product supplier prices were not working anymore due to bad SQL 2014-10-27 10:23:33 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
MAxime Kohlhaas
3a626d8503 Add : statistics on supplier orders and invoices on home page 2014-10-25 17:22:03 +02:00
Laurent Destailleur
4d515d660c New: Feature to link manually an order to an invoice does not disappear 
once link has been done.
 2014-10-24 14:17:36 +02:00
Laurent Destailleur
639d4f03a0 Experimentation option PROJECT_SHOW_REF_INTO_LISTS 2014-10-22 17:47:12 +02:00
jean
619bcb44df object must be reloaded before creating pdf on confirmation and ordering 2014-10-21 19:02:48 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
c30f13a03d Fix: label of input method not translated. 2014-10-12 02:07:50 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/list.php
 2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
d9f898ab8c Merge pull request #1916 from FHenry/develop 
Add feature to order to invoice on supplier part
 2014-10-04 00:31:11 +02:00
Regis Houssin
30221ae8cf Fix: missing fields 2014-10-02 09:00:40 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Laurent Destailleur
ba33f73767 Merge pull request #1925 from tiaris/develop 
adding hooks for supplier card and order card
 2014-09-29 15:40:31 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
722e939e19 Fix: form must not be into a closing and opening tr tag. 2014-09-26 13:23:54 +02:00
Florian HENRY
3bc227b467 Fix for travis syntax 2014-09-25 10:25:15 +02:00
jean
e9374e8c08 adding hook for addMoreActionsbuttons 2014-09-25 09:26:32 +02:00
jean
6149994b43 Adding hook 'suppliercard' on supplier cartd 2014-09-24 22:05:53 +02:00
Laurent Destailleur
396bae21d6 Fix: Missing closing tr 2014-09-24 18:15:20 +02:00
Florian HENRY
518d23f278 Add feature to order to invoice on supplier part 2014-09-23 16:28:29 +02:00
Florian HENRY
860253759b Add hook for addMorButton into supplier card 2014-09-23 11:59:57 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
016c889aa8 Refactored CommandeFournisseur::generateDocument and FactureFournisseur::generateDocument 2014-09-22 00:15:32 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00