Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,320 Commits 36 Branches 189 Tags
e698c3b64aa6ad8b31d962e2032c110e9bccda5f
Commit Graph

3131 Commits

Author SHA1 Message Date
Laurent Destailleur
a2676e5768 Fix: the type of notification sent was not filled 2015-03-18 21:06:55 +01:00
Laurent Destailleur
ba526c5a2f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-18 14:32:58 +01:00
Laurent Destailleur
2c61717e10 Fix sql syntax error 2015-03-18 14:19:17 +01:00
BENKE Charles
d5afa1b29f Update extrafields.class.php 
Link object : include only if something to display
 2015-03-18 13:23:14 +01:00
Laurent Destailleur
7ef11b2f38 Fix selected attribute not set correctly 2015-03-18 13:16:59 +01:00
Laurent Destailleur
84bea6166e Doxygen 2015-03-17 10:55:45 +01:00
Laurent Destailleur
4fffeb3a89 Clean code 2015-03-17 10:52:27 +01:00
Laurent Destailleur
689d270552 Doxygen 2015-03-17 10:47:20 +01:00
Laurent Destailleur
bfd979224f Var not declared 2015-03-17 10:38:25 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Marcos García de La Fuente
6ba3b900b7 PHPCS Fix 2015-03-15 23:42:11 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Ion Agorria
5f9b1fa029 Changes for applying new paths 2015-03-14 16:50:02 +01:00
Laurent Destailleur
10bbf463e7 Several bug fixes from scrutinizer 2015-03-14 14:55:41 +01:00
BENKE Charles
0aa2360691 Update extrafields.class.php 
add new extrafields type 'link'
 2015-03-14 12:31:22 +01:00
BENKE Charles
df9f822a70 Update commonobject.class.php 
new extafields type
 2015-03-14 12:25:17 +01:00
Laurent Destailleur
d056abc4e1 No need to have this protected. Property can be read with method show() 
and this method can be override.
 2015-03-13 21:45:52 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks. 
Extrafield index on fk_object must be unique.
 2015-03-13 20:27:54 +01:00
Maxime Kohlhaas
60022ab80d NEW : autofocus on product selection dropdown list or search field 2015-03-12 17:25:57 +01:00
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
Laurent Destailleur
e2e95b5f8c phpcs 2015-03-11 03:58:57 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
e8732df747 Merge pull request #2441 from aspangaro/develop-ReviewER 
FIXED: Review Expense Report
 2015-03-11 02:14:13 +01:00
Laurent Destailleur
c271257452 Prepare extrafield for option by default into lists 2015-03-10 22:27:16 +01:00
Laurent Destailleur
b4a8f19696 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/extrafields.class.php
 2015-03-10 18:37:13 +01:00
Laurent Destailleur
364b185442 Fix sql syntax 2015-03-10 18:33:14 +01:00
Laurent Destailleur
209f8946d0 All files must be lowercase 2015-03-10 14:17:58 +01:00
Laurent Destailleur
94acbeaa22 Prepare perms on extrafields 2015-03-09 21:40:24 +01:00
aspangaro
69dc3cdd61 Correct fk_statut & work en list 2015-03-08 08:21:49 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status 
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
 2015-03-08 02:08:26 +01:00
Laurent Destailleur
6db3f1b30e Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL 2015-03-07 19:06:56 +01:00
Florian HENRY
0d801be6a1 NEW: (Dev) DolGraph allow extended class to override $_stringtoshow 2015-03-06 06:12:47 +01:00
Scrutinizer Auto-Fixer
27e99793a3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-06 02:10:01 +00:00
Laurent Destailleur
049174b76f Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/ 2015-03-06 01:53:02 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
40adbe5a72 Merge pull request #2420 from aspangaro/develop-patch17 
NEW: [T1848] Merge bank card & account card
 2015-03-04 21:09:28 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57 Removed $permtoedit variable 2015-03-04 11:19:45 +01:00
Marcos García de La Fuente
54b6b199c7 Documented missing properties and removed redundant documentation 
(cherry picked from commit 6124f6a)
 2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9 Moved duplicated code to common class 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
f82df1e634 Refactorred supplier order to match with objectline templates 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
174f1cb5f7 Refactored supplier invoice line view to fit commonobjectline view 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
4c08d34bb5 Standardized $rowid as property 2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b0e728251a Every line has a $rowid property 2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
ad72425291 Moved some variables from FactureLigne to CommonInvoiceLine 2015-03-04 10:37:43 +01:00
Laurent Destailleur
4c1d51bd39 phpcs 2015-03-04 02:28:16 +01:00
Laurent Destailleur
6f96d4cd5c Minimum style 2015-03-04 02:18:20 +01:00
Laurent Destailleur
fddbca50b1 Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of 
tracking id into email.
 2015-03-03 18:33:53 +01:00