lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,203 Commits 43 Branches 150 Tags 886 MiB
560b4541cd
Commit Graph

46203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
232b2eca9f Merge branch 'atm-ph-incoterm' into develop 2015-03-04 23:04:57 +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
8d51890fd7 Merge pull request #2428 from fmarcet/3.7 
Fix: Masks works with thirdparty type
 2015-03-04 22:03:08 +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
Laurent Destailleur
8e29dcdb79 Some fix after merging bank account number form 2015-03-04 21:59:03 +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
0ebcf86170 Merge pull request #2421 from aspangaro/develop-patch18 
Typo "Copytight"
 2015-03-04 20:54:13 +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
Laurent Destailleur
4a9a96316d Merge branch 'frederic34-fetchobject' into develop 2015-03-04 20:47:45 +01:00
Laurent Destailleur
7a9de0feca CRLF 2015-03-04 20:45:33 +01:00
Laurent Destailleur
56e77382f3 Merge 2015-03-04 20:43:54 +01:00
Laurent Destailleur
4e144b6b76 Merge pull request #2416 from marcosgdf/bug-1825 
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
 2015-03-04 20:38:47 +01:00
Laurent Destailleur
6bf0b9b107 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-04 20:35:28 +01:00
Laurent Destailleur
f570cd6b42 Forgot to commit tables 2015-03-04 20:35:08 +01:00
Laurent Destailleur
20d5624440 Closed #2414 2015-03-04 20:34:41 +01:00
Laurent Destailleur
13d8f26247 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/class/project.class.php
 2015-03-04 18:58:50 +01:00
Laurent Destailleur
cf3190a4ef Bad error management 2015-03-04 18:56:57 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +01:00
Laurent Destailleur
081875c4d9 Merge pull request #2383 from aspangaro/3.7-patch4 
FIXED: Remove condition to show accountancy field on user.
 2015-03-04 18:02:09 +01:00
Laurent Destailleur
1cf39d4c8f Merge branch 'atm-ph-new_ask_price' into develop 2015-03-04 17:55:17 +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
d1c44d5498 Update doc 2015-03-04 16:30:38 +01:00
Laurent Destailleur
5335a6affa NEW: Add close date and user for projects. 2015-03-04 16:28:29 +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
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
Florian HENRY
28f6197ac5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-04 09:58:09 +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