Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

101561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +02:00
Laurent Destailleur
340949e0a9 Merge pull request #17640 from bb2a/salesrepresentativeinorderandinvoicelist 
NEW Add sale representative in order and invoice list
 2021-08-11 22:24:26 +02:00
Laurent Destailleur
896cdf4845 Update list.php 2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226 Merge branch 'develop' into salesrepresentativeinorderandinvoicelist 2021-08-11 22:22:26 +02:00
Laurent Destailleur
0d07135027 Update list.php 2021-08-11 22:19:53 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
745af0f025 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 21:54:35 +02:00
Laurent Destailleur
d66df5cb60 Complete #15548 2021-08-11 21:53:21 +02:00
Laurent Destailleur
2683a360c7 Merge pull request #15548 from defrance/patch-163 
NEW Can set the default BOM on a product
 2021-08-11 21:52:21 +02:00
Laurent Destailleur
0d2e3ece1a Update card.php 2021-08-11 21:50:28 +02:00
Laurent Destailleur
3af8e18b3c Create card.php 2021-08-11 21:47:28 +02:00
stickler-ci
3c0601d1f9 Fixing style errors. 2021-08-11 19:46:39 +00:00
Laurent Destailleur
5b30cf3e77 Update card.php 2021-08-11 21:44:18 +02:00
Laurent Destailleur
c36bb0fbf7 Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
stickler-ci
eadfc9f4ae Fixing style errors. 2021-08-11 19:36:18 +00:00
Laurent Destailleur
3befe8f383 Update 12.0.0-13.0.0.sql 2021-08-11 21:34:11 +02:00
Laurent Destailleur
80673e0efc Update card.php 2021-08-11 21:32:39 +02:00
Laurent Destailleur
9e54dc0dcb typo 2021-08-11 21:31:14 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2021-08-11 21:06:33 +02:00
Laurent Destailleur
bf72143823 Fix phpcs 2021-08-11 21:04:03 +02:00
Laurent Destailleur
911f8daec6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 21:03:04 +02:00
Laurent Destailleur
06b50051f1 Merge pull request #18356 from altairisfr/iban 
NEW: add constant MAIN_IBAN_IS_NEVER_MANDATORY
 2021-08-11 21:02:51 +02:00
Laurent Destailleur
012eee7e06 Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE 
NEW : add constant PROPOSAL_ARE_NOT_BILLABLE
 2021-08-11 21:00:53 +02:00
Laurent Destailleur
7db6503431 Merge pull request #18333 from Daniel-Mietchen/patch-1 
typo fix and copyedits in README.md
 2021-08-11 20:59:55 +02:00
lmarcouiller
51a28a4ac4 Fix lang error on hrm/index.php 2021-08-11 20:48:22 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
ec4a1d4cb7 Merge pull request #18344 from Hystepik/develop#4 
Fix lang error on hrm/index.php
 2021-08-11 20:47:35 +02:00
Laurent Destailleur
23713d1deb Merge pull request #18328 from lainwir3d/shipment_close_order_on_close 
NEW #18326 Workflow: Close order on shipment closing.
 2021-08-11 20:47:06 +02:00
Laurent Destailleur
ab3874a203 Merge pull request #18349 from cfoellmann/fix-stdvalue-target 
add GETPOST to 'target' value on new bookmarks
 2021-08-11 20:05:36 +02:00
Laurent Destailleur
687eb536ae Update card.php 2021-08-11 20:05:03 +02:00
Laurent Destailleur
e50710b17f Merge pull request #18334 from Daniel-Mietchen/patch-2 
typo fixes in .github/PULL_REQUEST_TEMPLATE.md
 2021-08-11 20:01:01 +02:00
Laurent Destailleur
8e9d0a567a Merge pull request #18360 from andreubisquerra/develop 
NEW Customer Display with TakePOS
 2021-08-11 20:00:36 +02:00
Laurent Destailleur
366332a6f5 Merge pull request #18347 from erikvanberkum/develop 
Fix: Change French word to English in English array.
 2021-08-11 19:59:21 +02:00
Laurent Destailleur
dad251493a Merge pull request #18355 from marc-dll/12.0_FIX_holiday_card_hooks 
FIX: holiday card: hooks uninitialized
 2021-08-11 19:58:50 +02:00
Laurent Destailleur
5a0adfc80b Merge pull request #18362 from fappels/15_update_actioncomm 
Update actioncomm.class
 2021-08-11 19:58:25 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Laurent Destailleur
1cdab44252 Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine 
Remove strange check on hook printOriginObjectLine.
 2021-08-11 15:55:55 +02:00
Laurent Destailleur
ab8f78f29a Merge pull request #18366 from atm-quentin/FIX_11_postgre_select_filter_extrafield 
FIX compatibility postgre sql
 2021-08-11 15:45:04 +02:00
Laurent Destailleur
8da328b183 Update extrafields_list_search_sql.tpl.php 2021-08-11 15:44:48 +02:00
Laurent Destailleur
dd5f2dd3a2 Merge pull request #18370 from cfoellmann/fix-link-supplier 
fix link to supplier card of thirdparty on supplier_order list
 2021-08-11 15:44:00 +02:00
Laurent Destailleur
3964bd28db Merge pull request #18385 from marc-dll/12.0_FIX_workflow_shipment_validate_trigger 
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
 2021-08-11 15:28:12 +02:00
Laurent Destailleur
0c64c09125 Merge pull request #18391 from bb2a/PDF_Add_propal_option_paiment 
NEW PDF add param hide paiment option
 2021-08-11 15:24:17 +02:00
Laurent Destailleur
065d7a781e Merge branch 'develop' into PDF_Add_propal_option_paiment 2021-08-11 15:24:10 +02:00
stickler-ci
775164f84a Fixing style errors. 2021-08-11 15:21:14 +02:00
Anthony Berton
c12905f0f3 ok 2021-08-11 15:21:08 +02:00
Laurent Destailleur
094a11fae6 Merge pull request #18390 from bb2a/save__pdf_option_other 
[FIX] PDF other options save Yes/No
 2021-08-11 15:19:38 +02:00