Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,188 Commits 36 Branches 189 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

4057 Commits

Author SHA1 Message Date
Laurent Destailleur
84695845bb Some fixes into translation and permissions 2015-03-09 21:20:56 +01:00
aspangaro
402e0c8ad5 Add condition to access on dictionary c_type_fees when the module is enabled 2015-03-07 15:06:45 +01:00
Scrutinizer Auto-Fixer
a0762a5113 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-06 01:31:49 +00:00
Laurent Destailleur
049174b76f Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/ 2015-03-06 01:53:02 +01:00
aspangaro
11704e0807 Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-05 20:24:53 +01:00
Guillaume de Lestanville
dd2594692e Updating compatibility with Sqlite3 
- Replace USING syntax by IN SELECT syntax
- Fix error on database creation
- Removing test on username parameter when installing.
 2015-03-05 17:35:37 +01:00
guillaume
0ef46b06f4 Sqlite3-PDO restoration 
FR:
- Restauration de la version PDO dans sqlite.class.php et désactivation.
- Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php

EN:
- revert of the PDO version of sqlite.class.php and deactivation.
- add database class Sqlite3 into sqlite3.class.php.
 2015-03-05 10:52:37 +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
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
guillaume
5a5a2f1bcf Affichage de la liste des tables dans les infos de base de données. 2015-03-03 15:54:55 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +01:00
Laurent Destailleur
79023cddb0 Fix external calendar for users were not visible if no global calendar 
was set.
 2015-03-02 17:34:50 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Laurent Destailleur
50d8137618 Merge pull request #2384 from marcosgdf/better-practice 
Better practice in getBrowserInfo
 2015-03-02 00:28:40 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup 
into a tpl file.
 2015-02-28 20:14:26 +01:00
Laurent Destailleur
f8e9a38e5c Fix: Avoid empty table into setup when module are missing. 2015-02-28 19:37:44 +01:00
Marcos García de La Fuente
60e2524fc2 Merge remote-tracking branch 'upstream/develop' into better-practice 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
 2015-02-28 14:39:14 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
1c04af2e55 Merge branch 'feature_Product_stock_subproduct_stock_independent' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent

Conflicts:
	htdocs/langs/en_US/products.lang
 2015-02-24 17:23:23 +01:00
Laurent Destailleur
472181a03b Merge pull request #2374 from frederic34/filecheck 
Files Integrity Checker
 2015-02-24 10:08:39 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
570194b4b9 Fix validation of email when there is a comma separator. 2015-02-23 13:10:18 +01:00
Alexis Algoud
72908c1fd3 Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent 2015-02-23 10:51:41 +01:00
Laurent Destailleur
b04682db4c Fix Edit of extrafield on supplier invoice or order was deleteing other 
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
 2015-02-22 17:41:02 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
frederic34
2b19f75460 Files Integrity Checker 2015-02-19 21:26:03 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Gauthier
02d59cce5a NEW : Product stock and subproduct stock are independant 2015-02-16 16:06:50 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:12:22 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
53453a63f5 Fix: pb when posting page due to apache limit 2015-02-07 01:45:09 +01:00
phf
bf643c26da [CORE] FIX : des noms des hooks 
+ correction nom de variable (#new_ask_price).
 2015-02-06 09:50:27 +01:00
phf
bcbf29d9a5 [CORE] assainissement du code + traductions FR vers EN (#new_ask_price). 2015-02-04 15:39:57 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
67c1ae8593 Fixed: condition to show menus 2015-01-30 15:47:27 +01:00
phf
87398c7d43 [CORE] renomage de variables pour être en rapport avec le module (#new_ask_price). 2015-01-29 10:42:53 +01:00
Drosis Nikos
fc7f2f2303 translate UpdateServerOffline 2015-01-28 23:12:46 +02:00
phf
a98ce01807 [CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price). 2015-01-28 17:27:26 +01:00