Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,821 Commits 36 Branches 189 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

2281 Commits

Author SHA1 Message Date
florian HENRY
4e5f646a0f fix travis test 2016-09-26 17:07:45 +02:00
florian HENRY
5a8f0491b3 wotk on declaration method OrderLine 2016-09-26 09:34:51 +02:00
Laurent Destailleur
3cb13e16d1 Merge branch 'rest-api-add-accounts' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php
 2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Laurent Destailleur
34378d8bef Fix phpcs 2016-09-25 17:48:48 +02:00
Laurent Destailleur
a7db09c020 Fix phpcs 2016-09-24 23:06:09 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
35dd492d19 NEW Add REST api for commercial proposals 2016-09-22 12:53:44 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
2facdda690 Uniformize code 2016-09-12 21:54:45 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Laurent Destailleur
49e54d55d5 Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not 
usable.
 2016-09-10 18:19:54 +02:00
Laurent Destailleur
1b00d55021 NEW New set of icon for status easier to understand. 2016-09-10 17:57:35 +02:00
Laurent Destailleur
aeffffe523 NEW REST api order: Parameter to filter thirdparty can be a list of ids 2016-09-09 20:09:12 +02:00
Laurent Destailleur
616594355b NEW Can select fields on expense report list. Can make mass delete. 2016-09-09 15:36:33 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
10c1f02243 Extrafields for expensereports are visible on cards 2016-09-06 13:39:44 +02:00
Laurent Destailleur
b52e2f404c NEW Can select fields/extrafields on contract list + Mass delete action. 2016-09-02 14:47:59 +02:00
Laurent Destailleur
91ede48390 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
Laurent Destailleur
ec5bd2a8f8 Fix button create contract from order not visible sometimes 2016-09-01 00:40:48 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Josep Lluís
c385b86793 Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVERY_DATE 
In title and in filter the delivery date column is well hidden. 
The error is only in column value,
 2016-08-16 23:12:02 +02:00
florian HENRY
5bb3b5c074 FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return '' 2016-08-10 09:47:25 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Laurent Destailleur
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +02:00
Laurent Destailleur
5eda10e0dd Fix link 2016-08-01 16:04:49 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
5d81db9693 Update skeleton with mass action code 2016-07-30 20:05:54 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Marcos García de La Fuente
86c2ced714 Missing $user variable 2016-07-29 11:53:24 +02:00
Laurent Destailleur
4e8e7f8e05 NEW New REST API explorer. Can create invoice and orders with lines. 2016-07-29 02:28:51 +02:00
Laurent Destailleur
9ca7f2cb66 Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by 
default).
 2016-07-28 19:02:23 +02:00
Laurent Destailleur
e4f51b7f32 FIX Select new thirdparty 2016-07-27 14:15:58 +02:00
Laurent Destailleur
a147798f18 FIX Select new thirdparty 2016-07-27 14:15:14 +02:00
Laurent Destailleur
ee0c77a305 Merge branch 'refactor-rest-api' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api

Conflicts:
	htdocs/api/admin/explorer.php
 2016-07-27 14:06:14 +02:00
Marcos García de La Fuente
1ef27913d7 FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them 2016-07-26 17:07:56 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Laurent Destailleur
a82e551a54 Start to work to mutualize code of mass actions 2016-07-25 19:43:07 +02:00
Laurent Destailleur
08d23b482b NEW Introduce mass action "delete" on sales orders. 2016-07-23 12:17:47 +02:00