lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,255 Commits 43 Branches 150 Tags 886 MiB
eaee252a5d
Commit Graph

210 Commits

Author SHA1 Message Date
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
4d60fb3468 Fix size of popup 2018-05-29 10:57:14 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs 2018-05-27 09:27:09 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
 2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
0a581e48d4
Update card.php 2018-05-25 11:04:04 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
Laurent Destailleur
745aa4bd73 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 23:38:46 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +02:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation 
Add credit note compatibility with situation invoice.
 2018-05-18 11:34:10 +02:00
Laurent Destailleur
e2369dea29 FIX #8722 2018-05-18 11:17:21 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop 
Fix #8722 useless sql ORDER BY
 2018-05-18 11:16:08 +02:00
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
John
8175d90816 change case 2018-05-17 09:01:49 +02:00
John
fddd3156b1 add hidden conf 2018-05-16 16:15:30 +02:00
John
4a0195deee Fix merge mistake 2018-05-16 15:55:56 +02:00
John
f773317bf5 remove comment and move table 2018-05-16 15:55:42 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
John
b42c87256c Fix_situation_discount_used 2018-05-14 14:55:33 +02:00
Chl
9b2f62791b Fix #8722 useless sql ORDER BY 2018-05-13 15:52:47 +02:00
atm-john
6b2dfa0528 Extend lines import to propal 2018-05-10 21:06:18 +02:00
ATM-Nicolas
64dde1595b FIX : Credit note links set from source invoice links 2018-04-24 11:48:26 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Laurent Destailleur
e7d69b18bd
Merge pull request #8504 from ATM-Nicolas/develop 
NEW : Add link between credit note invoice and origin
 2018-04-06 09:15:02 +02:00
John
b02f34b038 Add line edit progress test 2018-04-05 17:13:45 +02:00
John
689b3e3b64 Fix outing invoice ligne progress 2018-04-05 11:25:11 +02:00
John
b37a2f17bf Fix credit note update on remove from cycle action 2018-04-05 10:48:20 +02:00
John
e966d11356 Fix credit note card apparence 2018-04-05 09:46:55 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
ATM-Nicolas
b9a91c667f NEW : Add link between credit note invoice and origin 2018-04-04 09:33:59 +02:00
John
299859d0c4 add action to remove from cycle 2018-04-03 17:34:20 +02:00
John
70321a8b71 add button to remove from cycle 2018-04-03 15:12:44 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
2d3a55a6a8 Restore broken confirmation popup 2018-03-31 23:39:08 +02:00
Laurent Destailleur
927d86f27f Revert "NEW: formconfirm in javascript" 
This reverts commit 50790d5527.
 2018-03-31 23:10:12 +02:00
Laurent Destailleur
7c394733e4
Merge pull request #8445 from ATM-Consulting/develop_atm 
NEW: bank reconcile: checkbox to select all bank operations
 2018-03-29 14:49:41 +02:00
John
88fab15c60 Change situation display 2018-03-23 17:12:09 +01:00
Marc de Lima Lucio
50790d5527 NEW: formconfirm in javascript 2018-03-23 16:54:33 +01:00
John
6a676ea49e fix percent 2018-03-23 12:24:47 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
John
fd86e90df2 Add create creadit note btn 2018-03-22 11:19:39 +01:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00