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

46761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
69eaa032bf Merge remote-tracking branch 'origin/3.7' into develop 2015-04-03 01:10:55 +02:00
Laurent Destailleur
98b1d6170d Fix style fieldrequired must be used only in create/edit mode. 2015-04-03 01:07:17 +02:00
Laurent Destailleur
2f2f141fd8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-03 00:28:44 +02:00
Laurent Destailleur
d71a3c52b4 Comments 2015-04-03 00:28:35 +02:00
Laurent Destailleur
9921eb8496 Fix error when upgating price 2015-04-02 19:41:19 +02:00
Laurent Destailleur
3c02b37c21 Merge pull request #2531 from frederic34/patch-5 
Update box_actions.php
 2015-04-02 19:03:03 +02:00
Laurent Destailleur
9b99ef9351 Merge pull request #2533 from frederic34/patch-7 
Travis Fix don.class.php
 2015-04-02 19:02:34 +02:00
Frédéric FRANCE
8d7fb7b0f6 Travis Fix don.class.php 2015-04-02 18:48:47 +02:00
Laurent Destailleur
e480177d9c Fix error of triggers not reported to user 2015-04-02 18:44:02 +02:00
Frédéric FRANCE
5a17a51212 Update box_actions.php 2015-04-02 18:11:30 +02:00
Laurent Destailleur
4241244345 Fix: class not defined 2015-04-02 17:35:07 +02:00
Laurent Destailleur
f3ad345930 Add loan lang file 2015-04-02 16:59:20 +02:00
Laurent Destailleur
c90a86e4a4 Fix filters for exports 2015-04-02 16:58:36 +02:00
Laurent Destailleur
761409caf6 Fix sql error 2015-04-02 15:17:07 +02:00
Laurent Destailleur
805c73b849 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/en_GB/main.lang
	htdocs/langs/es_CO/salaries.lang
 2015-04-02 14:04:04 +02:00
Laurent Destailleur
acbeb2b360 Fix en_GB 2015-04-02 14:03:52 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
 2015-04-02 13:57:20 +02:00
Laurent Destailleur
8d892e19c1 Sync from transifex 2015-04-02 13:56:32 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
8390b9bd16 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-02 12:55:58 +02:00
Laurent Destailleur
50d77d7e6f Correct source lang 2015-04-02 12:55:44 +02:00
Laurent Destailleur
c62687d198 Comment 2015-04-02 12:55:00 +02:00
Laurent Destailleur
849b94b087 Fix cd not required 2015-04-02 12:49:11 +02:00
Laurent Destailleur
882baa55be Deprecated test 2015-04-02 11:53:47 +02:00
Laurent Destailleur
fcb70bc193 Merge pull request #2528 from frederic34/patch-16 
Update card.php
 2015-04-02 11:46:59 +02:00
Laurent Destailleur
c5d81193a2 Merge pull request #2515 from frederic34/patch-11 
Correction warning delay workboard propal
 2015-04-02 11:45:57 +02:00
Laurent Destailleur
5b190371ab Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-02 11:45:01 +02:00
Laurent Destailleur
f89d74d6bc Deletion of dir was not complete. 2015-04-02 11:44:43 +02:00
Laurent Destailleur
52523effc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-02 11:42:29 +02:00
Laurent Destailleur
e827b1b9cd Merge pull request #2529 from aspangaro/develop-don 
NEW better integration in project for donation module
 2015-04-02 11:42:15 +02:00
Laurent Destailleur
d8bec2fb59 Merge pull request #2507 from frederic34/doc4contact 
Add document tab for contact
 2015-04-02 11:41:35 +02:00
Laurent Destailleur
c9f690904c Merge pull request #2514 from frederic34/patch-10 
Correction for workboard in compta/bank/index.php
 2015-04-02 11:40:55 +02:00
Laurent Destailleur
7932923251 Merge pull request #2523 from frederic34/initdata 
Remove logo in initdata for admin user
 2015-04-02 11:39:55 +02:00
Laurent Destailleur
051f3474c4 Merge pull request #2512 from frederic34/patch-9 
Add badge
 2015-04-02 11:25:06 +02:00
Laurent Destailleur
c5b6fc45eb Merge pull request #2527 from frederic34/patch-15 
Delete phpinfo.php
 2015-04-02 11:24:52 +02:00
Laurent Destailleur
0187a9a4ee Merge pull request #2511 from fappels/3.7 
FIX: dispatch batch products
 2015-04-02 11:24:01 +02:00
Laurent Destailleur
bff4b0e52e Merge pull request #2506 from frederic34/patch-8 
Add ORDER_CANCEL in interface_90_all_Demo.class.php
 2015-04-02 11:22:38 +02:00
Laurent Destailleur
d20873454c Follow a more standard syntax 2015-04-02 11:17:57 +02:00
Laurent Destailleur
17b0d98211 Merge pull request #2516 from aspangaro/develop-search 
New: Add a button to purge criteria in bank lines list
 2015-04-02 11:15:12 +02:00
Laurent Destailleur
fd1b644490 Make things easier to remind. Same rule for commit and PR. 2015-04-02 11:14:32 +02:00
Laurent Destailleur
10f967e07a FIX #2519 2015-04-02 11:11:03 +02:00
Laurent Destailleur
c476858880 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-02 11:01:41 +02:00
Laurent Destailleur
29fc2652e1 FIX #2519 2015-04-02 11:00:37 +02:00
Laurent Destailleur
10de082a60 Merge pull request #2530 from aspangaro/develop-project1 
New: In project - Elements - Show detail of amounts with a minus when the amount decrease margin
 2015-04-02 10:44:07 +02:00
aspangaro
115777f05d New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin 2015-04-02 06:54:04 +02:00
aspangaro
d8f56eb406 New: better integration in project for donation module 
Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility
 2015-04-02 06:36:32 +02:00
Juanjo Menent
4588b2bb4c Merge pull request #2517 from frederic34/patch-12 
Closes #2509  Bug: Ref is not shown in the bubble that appears when the mouse is over an agenda link
 2015-04-02 00:56:42 +02:00
Juanjo Menent
b42903440c Merge pull request #2521 from aspangaro/develop-don 
Closes #2520
 2015-04-02 00:51:29 +02:00
Frédéric FRANCE
dc89e36583 Update card.php 2015-04-01 21:12:08 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
 2015-04-01 21:00:51 +02:00