Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,239 Commits 36 Branches 190 Tags
2e68b51a107c9ad90c2d9fee5f9e5f33939b2caa
Commit Graph

39826 Commits

Author SHA1 Message Date
Marcos García de La Fuente
2e68b51a10 Merge remote-tracking branch 'upstream/develop' into develop 2015-03-15 17:52:07 +01:00
Laurent Destailleur
35dfaf4dd1 Natural search on numeric works also with several space after operator 2015-03-10 10:14:24 +01:00
Laurent Destailleur
2ea3eb3505 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-10 10:12:08 +01:00
Laurent Destailleur
dc30092290 Add column to store salary ref when doing payment. 2015-03-10 10:11:51 +01:00
Laurent Destailleur
90abe5cdf9 NEW: Add current salary on list of payment 2015-03-10 09:29:24 +01:00
Laurent Destailleur
3894a48ffd Fix: bad CSS 2015-03-08 02:37:25 +01:00
Laurent Destailleur
7c08f33fe1 Missing style buttonRefused 2015-03-08 02:26:41 +01:00
Laurent Destailleur
3e48456359 Fix when no price defined, we must how nothing instead of 0 2015-03-08 02:13:47 +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
dd13e477b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-07 19:07:21 +01:00
Laurent Destailleur
6db3f1b30e Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL 2015-03-07 19:06:56 +01:00
Laurent Destailleur
fc0be43f5f Fix: beautify search box 2015-03-06 22:40:41 +01:00
Laurent Destailleur
c80007c680 Fix: we must use stockreal of stockvirtual when we are speaking about 
stock ('stock' alone is not accurate enough)
 2015-03-06 21:57:58 +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
39192163c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-06 16:22:23 +01:00
Laurent Destailleur
e55a983c03 Fix td balance 2015-03-06 16:13:09 +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
Laurent Destailleur
77dd07c846 Fix thumbs generation 2015-03-06 13:12:33 +01:00
Laurent Destailleur
d4e37431e9 Merge pull request #2434 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2015-03-06 03:18:13 +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
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
2aefe61506 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-06 02:15:18 +01:00
Laurent Destailleur
c7c7c393ee sql syntax errors 2015-03-06 02:14:59 +01: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
560b4541cd Update packager. 2015-03-05 22:08:16 +01:00
Laurent Destailleur
97f36825df Work on new timesheet page 2015-03-05 21:47:50 +01:00
Laurent Destailleur
22045603b7 Fix bad update of denormalized field 2015-03-05 13:51:29 +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
8b5dd4910f Fix bad update of denormalized field 2015-03-05 13:02:37 +01:00
Laurent Destailleur
78f971f3e1 Merge remote-tracking branch 'origin/3.7' into develop 2015-03-05 11:46:48 +01:00
Laurent Destailleur
9c12c325db Fix regression into enable/disable external calendars 2015-03-05 11:46:03 +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
6c1c1fd691 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/agenda.lib.php
	htdocs/fourn/paiement/fiche.php
 2015-03-05 11:35:39 +01:00
Laurent Destailleur
35a0575aad Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-05 11:22:34 +01:00
Laurent Destailleur
dc15eee533 Fix: missing dependcy on project to check before deleting 2015-03-05 11:21:58 +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
Laurent Destailleur
39a7271f91 Fix bad merge 2015-03-05 10:57:17 +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
73364c2021 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-04 23:05:31 +01:00
Laurent Destailleur
5c36db06f6 Add missing files 2015-03-04 23:04:37 +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
596f977f7c Merge pull request #2423 from defrance69/patch-49 
Update index.php
 2015-03-04 22:02:16 +01:00
Laurent Destailleur
5f9f536f0b Merge pull request #2417 from marcosgdf/bug-1892 
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 2015-03-04 22:01:37 +01:00