Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 191 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

1526 Commits

Author SHA1 Message Date
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
e31223d7be Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-27 02:33:14 +02:00
Laurent Destailleur
6b7c59635e Merge pull request #7715 from grandoc/new_branch_26_10_17 
Fix : Warning: A non-numeric value encountered in on line 57 58 59
 2017-10-27 02:18:26 +02:00
Laurent Destailleur
61909d842d Update document.php 2017-10-27 02:18:11 +02:00
Laurent Destailleur
8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/contrat/class/contrat.class.php
	htdocs/product/list.php
 2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2017-10-26 17:02:40 +02:00
Philippe GRAND
d9d4b6e06d Fix : Warning: A non-numeric value encountered in on line 57 58 59 2017-10-26 13:03:39 +02:00
Laurent Destailleur
98674f6d82 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/societe/class/api_contacts.class.php
	htdocs/societe/class/api_thirdparties.class.php
 2017-10-22 15:01:35 +02:00
Laurent Destailleur
be0cd601a9 Fix dead code 2017-10-22 14:07:54 +02:00
Laurent Destailleur
703d4a6aee FIX #7648 2017-10-22 14:02:24 +02:00
Laurent Destailleur
c9fceaad3c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/index.php
	htdocs/fourn/facture/card.php
 2017-10-22 04:04:26 +02:00
Frédéric FRANCE
8baad70f6c stock on supplier invoice back to draft 2017-10-21 20:26:32 +02:00
TuxGasy
9c3805c0d5 Fix anchor after add line 2017-10-19 14:10:58 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
d70c215ab8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries.php
	htdocs/fourn/facture/card.php
 2017-10-17 11:14:58 +02:00
Laurent Destailleur
626fea3f7a Merge pull request #7608 from atm-john/fix_supplier_invoice_from_supp_order 
Fix extrafields transmition from supplier order to supplier invoice
 2017-10-16 20:22:26 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
807724e0f0 Add link other invoices of third party on supplier card to 2017-10-13 21:32:05 +02:00
Laurent Destailleur
1f2555d7c6 Add link other invoices of third party on supplier card to 2017-10-13 19:51:36 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e Various fixes 2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
John
b213c7ed24 Fix extrafields transmition from supplier order to supplier invoice 2017-10-10 14:15:06 +02:00
Laurent Destailleur
c22cd1cfe9 Fix test on entity must always be done using the "IN" instead of "=" 2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-09-26 22:11:00 +02:00
Laurent Destailleur
49982b36ac FIX #7490 2017-09-26 11:55:19 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
fe55feb82f FIX #7461 2017-09-25 19:45:01 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9 NEW Send by email available in bulk for expense report 2017-09-16 22:03:25 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2017-09-16 12:11:18 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00