Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,830 Commits 36 Branches 190 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

9302 Commits

Author SHA1 Message Date
aspangaro
80ad1be820 Merge remote-tracking branch 'Upstream/develop' into develop-patch21 2015-03-08 06:40:31 +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
aspangaro
df305bd316 Deactivate conflict with Mod Deplacement - Need to access on old data 2015-03-07 15:01:30 +01:00
Laurent Destailleur
9e4e9a5411 NEW: Can search on customer order amount into customer order list. 2015-03-06 20:59:18 +01:00
Laurent Destailleur
dd3f569ede NEW: Enhance the natural_search function so we can use it to search 
numeric fields with criteria with operator <>= inside (< 100, >= 1000)
 2015-03-06 20:34:00 +01:00
Laurent Destailleur
a1567778ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/commande/card.php
 2015-03-06 18:51:55 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +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
e67c328cef Merge pull request #2429 from defrance69/patch-50 
Update modFacture.class.php
 2015-03-06 02:05:00 +01: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
1660c1c05b Fix bug introduced with var_dump 2015-03-06 01:30:46 +01:00
Laurent Destailleur
97f36825df Work on new timesheet page 2015-03-05 21:47:50 +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
Laurent Destailleur
d7ab3f112c NEW: Show difference between timespent by everybody and time spent by 
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
 2015-03-05 13:48:57 +01:00
Laurent Destailleur
d119397129 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-05 11:38:16 +01:00
Laurent Destailleur
e431e24889 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-05 11:14:01 +01:00
Laurent Destailleur
c36f92396b Add navigation into the new timesheet week page. 
Fix bad merge
 2015-03-05 11:13:44 +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
BENKE Charles
703a6c1b54 Update modFacture.class.php 
add fk_bank on bill export, this fields is needed to link with external accounting
 2015-03-05 00:38:54 +01:00
Laurent Destailleur
ec4c1a493f Merge pull request #2424 from FHenry/develop 
NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export
 2015-03-04 23:14:05 +01:00
Laurent Destailleur
f0f0e7bfbb Merge pull request #2415 from aspangaro/develop-patch16 
NEW: Add bank account owner in invoice/proposal/orders footer
 2015-03-04 23:07:46 +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
09035c1fee Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr 
into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php
 2015-03-04 20:52:54 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +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
41c55d1913 Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value 2015-03-04 11:55:17 +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
b84cf4afac Renamed FactureFournisseurLine to SupplierInvoiceLine 2015-03-04 10:37:46 +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
Marcos García de La Fuente
0170d409d3 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2015-03-04 10:16:25 +01:00
Florian HENRY
14847e2b5d Better column order 2015-03-04 10:08:13 +01:00
Florian HENRY
fdbb0ace8b NEW : Add company information into category contact export 2015-03-04 10:00:37 +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
2c3a412c3a Fix export extrafield on supplier orders 2015-03-04 02:08:51 +01:00
Laurent Destailleur
52425648bf NEW: When using transfer or correct stock from warehouse, after 
recording we go back to the warehouse page.
 2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
Laurent Destailleur
107a16ed75 Work on timesheet module 2015-03-04 00:53:35 +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
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00