Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
46,237 Commits 36 Branches 189 Tags
11704e0807fcbb7bc125caef06cef743576ae9f1
Commit Graph

1516 Commits

Author SHA1 Message Date
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
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
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
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
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
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
2c3a412c3a Fix export extrafield on supplier orders 2015-03-04 02:08:51 +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
73afe1513d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/index.php
 2015-03-02 03:07:19 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using 
correct setup to decide which bank to show.
 2015-03-02 02:59:59 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
3fb3e4af4e Merge pull request #2386 from lrq3000/3.7 
Fix lastrowid-*table* option when defining imports
 2015-02-24 17:16:17 +01:00
Laurent Destailleur
fec9e222b1 Merge pull request #2391 from aspangaro/develop-patch10 
FIXED: Module Expense Report - Correct init
 2015-02-24 17:11:32 +01:00
Laurent Destailleur
fd9fc191fc Merge pull request #2388 from aspangaro/develop-patch8 
Module Expense Report: reactivate conflict with modDeplacement
 2015-02-24 17:06:43 +01:00
Laurent Destailleur
f23234356e Merge pull request #2387 from aspangaro/develop-patch7 
Move new module Expense Report in hrm
 2015-02-24 17:03:12 +01:00
Laurent Destailleur
714b3d277c Merge pull request #2394 from aspangaro/develop-patch12 
FIXED: Update licence to GPLv3
 2015-02-24 16:56:01 +01:00
Laurent Destailleur
562348eb34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1 Fix missing fields into import of thirdparties. 
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
 2015-02-24 15:40:50 +01:00
Laurent Destailleur
44c392ca23 Fix missing profid5 and 6 2015-02-24 13:35:37 +01:00
aspangaro
c1069eea47 FIXED: Update licence to GPLv3 2015-02-23 22:04:01 +01:00
aspangaro
be3fd5529a FIXED: Module Expense Report - Correct init 2015-02-23 20:31:44 +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
phf
11a0624e39 [CORE] FIX Travis phpcs (#incoterm). 2015-02-23 11:19:00 +01:00
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
phf
c459794999 [CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm). 2015-02-23 10:36:44 +01:00
aspangaro
d0cc072a58 Module Expense Report: reactivate conflictwith modDeplacement 2015-02-23 06:49:11 +01:00
aspangaro
95f211775b Move new module Expense Report in hrm 2015-02-23 06:45:03 +01:00
Laurent Destailleur
1bba3a01e2 phpcs 2015-02-22 23:41:34 +01:00
Stephen L
fe62e038ca Fix lastrowid-*table* option when defining imports (fix extrafields fk_object value) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2015-02-22 14:34:51 +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
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
9ac38dee45 Merge pull request #2367 from marcosgdf/bug-1652 
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
 2015-02-20 23:27:53 +01:00
Laurent Destailleur
a6e2e5ffcb Merge pull request #2360 from delcroip/patch-1 
export on user
 2015-02-19 00:14:04 +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
bd9c168e3c Doxygen 2015-02-18 23:42:39 +01:00
Laurent Destailleur
06c90e67bb Merge pull request #2339 from KreizIT/fix_1829 
FIXED: #1829 POS not compatible with batch products
 2015-02-18 22:38:19 +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
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00
Laurent Destailleur
bc88917b81 phpcs 2015-02-17 10:18:01 +01:00
Laurent Destailleur
a64cd69639 phpcs 2015-02-17 09:56:19 +01:00
Marcos García de La Fuente
529d4447ef Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients 2015-02-17 00:04:31 +01:00